Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 02:44:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Nix: bump nixpkgs to nixos-23.05 (except gnumake) (#31052)

Browse source 
* Nix: bump nixpkgs to nixos-23.05 (except gnumake)

* try nixos-unstable except clangStdenv + LIBCLANG_PATH

* revert due to missing @GLIBC_2.38 symbols

(db2f8c5d9d)
This commit is contained in:
Delan Azabani 2024-01-10 20:50:19 +08:00 • committed by GitHub
parent 3555671864
commit 17ffbbdd11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
etc/shell.nix
View file

@ -2,7 +2,7 @@
# NOTE: This does not work offline or for nix-build # NOTE: This does not work offline or for nix-build
with import (builtins.fetchTarball { with import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/6adf48f53d819a7b6e15672817fa1e78e5f4e84f.tar.gz"; url = "https://github.com/NixOS/nixpkgs/archive/70bdadeb94ffc8806c0570eb5c2695ad29f0e421.tar.gz";
}) { }) {
overlays = [ overlays = [
(import (builtins.fetchTarball { (import (builtins.fetchTarball {
@ -17,6 +17,9 @@ let
cargo = rustToolchain; cargo = rustToolchain;
rustc = rustToolchain; rustc = rustToolchain;
}; };
pkgs_gnumake_4_3 = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/6adf48f53d819a7b6e15672817fa1e78e5f4e84f.tar.gz";
}) {};
in in
clangStdenv.mkDerivation rec { clangStdenv.mkDerivation rec {
name = "servo-env"; name = "servo-env";
@ -38,11 +41,12 @@ clangStdenv.mkDerivation rec {
# Build utilities # Build utilities
cmake dbus gcc git pkg-config which llvm perl yasm m4 cmake dbus gcc git pkg-config which llvm perl yasm m4
(python3.withPackages (ps: with ps; [virtualenv pip dbus])) (python3.withPackages (ps: with ps; [virtualenv pip dbus]))
# This pins gnumake to 4.3 since 4.4 breaks jobserver # This pins gnumake to 4.3 since 4.4 breaks jobserver
# functionality in mozjs and causes builds to be extremely # functionality in mozjs and causes builds to be extremely
# slow as it behaves as if -j1 was passed. # slow as it behaves as if -j1 was passed.
# See https://github.com/servo/mozjs/issues/375 # See https://github.com/servo/mozjs/issues/375
gnumake pkgs_gnumake_4_3.gnumake
# crown needs to be in our Cargo workspace so we can test it with `mach test`. This means its # crown needs to be in our Cargo workspace so we can test it with `mach test`. This means its
# dependency tree is listed in the main Cargo.lock, making it awkward to build with Nix because # dependency tree is listed in the main Cargo.lock, making it awkward to build with Nix because