diff options
| author | Lucas Ransan <lucas@ransan.tk> | 2020-12-24 14:01:24 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-28 08:43:33 +0100 |
| commit | 2cb2a5348e187a877175976ffd5c1a141f523b8f (patch) | |
| tree | ec439d7d30bf717789b1463a6c26bacc25ea7743 /pkgs/tools | |
| parent | a909a45e04e5e520fa22f9f960dcc72371132bcd (diff) | |
| download | nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.tar nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.tar.gz nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.tar.bz2 nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.tar.lz nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.tar.xz nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.tar.zst nixpkgs-2cb2a5348e187a877175976ffd5c1a141f523b8f.zip | |
nixUnstable: fix build on gcc10
Diffstat (limited to 'pkgs/tools')
| -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 bfc67ccac63..e30b712c5fa 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"; @@ -208,6 +208,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; }); |