diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2021-01-03 09:59:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-03 09:59:31 +0100 |
commit | f7267e9797ac07efd6e9e2f4b21bb0068779b5b6 (patch) | |
tree | 66c059d776458e64bfeb8bb2613c55763f62554d /pkgs/tools/package-management | |
parent | 0960eff85cb2ad17d2864499b28495b7f6f353da (diff) | |
parent | 279110cd86e9c969f8f2942675f7c73cfe4059d3 (diff) | |
download | nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.tar nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.tar.gz nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.tar.bz2 nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.tar.lz nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.tar.xz nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.tar.zst nixlib-f7267e9797ac07efd6e9e2f4b21bb0068779b5b6.zip |
Merge pull request #107783 from NixOS/staging-next
Staging next (with gcc 10, binutils 2.34 and autoconf 2.70)
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 9d583d7e4288..06f5a651f69e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, callPackage +{ lib, fetchurl, fetchpatch, fetchFromGitHub, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -23,13 +23,13 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? false - , name, suffix ? "", src + , name, suffix ? "", src, patches ? [] }: let sh = busybox-sandbox-shell; nix = stdenv.mkDerivation rec { - inherit name src; + inherit name src patches; version = lib.getVersion name; is24 = lib.versionAtLeast version "2.4pre"; @@ -213,6 +213,13 @@ in rec { sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; }; + patches = [ + (fetchpatch { # Fix build on gcc10 + url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; + sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; + }) + ]; + inherit storeDir stateDir confDir boehmgc; }); |