diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/stdenv/linux')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/stdenv/linux/default.nix | 4 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/stdenv/linux/default.nix b/infra/libkookie/nixpkgs/pkgs/stdenv/linux/default.nix index 6c396b277469..6d6bca870bf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/stdenv/linux/default.nix @@ -274,9 +274,9 @@ in gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; }; mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; }; libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; }; - isl_0_17 = super.isl_0_17.override { stdenv = self.makeStaticLibraries self.stdenv; }; + isl_0_20 = super.isl_0_20.override { stdenv = self.makeStaticLibraries self.stdenv; }; gcc-unwrapped = super.gcc-unwrapped.override { - isl = isl_0_17; + isl = isl_0_20; }; }; extraNativeBuildInputs = [ prevStage.patchelf ] ++ diff --git a/infra/libkookie/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix b/infra/libkookie/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix index ec5f1092a469..25cde589a923 100644 --- a/infra/libkookie/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/infra/libkookie/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -47,6 +47,12 @@ in with pkgs; rec { stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; + meta = { + # Increase priority to unblock nixpkgs-unstable + # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 + schedulingPriority = 200; + }; + nativeBuildInputs = [ buildPackages.nukeReferences buildPackages.cpio ]; buildCommand = '' @@ -152,7 +158,7 @@ in with pkgs; rec { # These needed for cross but not native tools because the stdenv # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. - cp -d ${isl_0_17.out}/lib/libisl*.so* $out/lib + cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib @@ -199,6 +205,12 @@ in with pkgs; rec { dist = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; + meta = { + # Increase priority to unblock nixpkgs-unstable + # https://github.com/NixOS/nixpkgs/pull/104679#issuecomment-732267288 + schedulingPriority = 200; + }; + buildCommand = '' mkdir -p $out/nix-support echo "file tarball ${build}/on-server/bootstrap-tools.tar.xz" >> $out/nix-support/hydra-build-products |