about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2021-05-15 15:47:41 +0200
committerGitHub <noreply@github.com>2021-05-15 15:47:41 +0200
commitf5f8f2415e5959933351cbcc8dce3afe20796cfc (patch)
tree510369746b8a4e872c84ab678d04e31c091dee23 /pkgs/tools/package-management
parente83b3f3394834c41c0d25017f6808d65c3d6f880 (diff)
parent5e7e70b2004f58d852730c91ad9b0a0833d902f1 (diff)
downloadnixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.tar
nixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.tar.gz
nixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.tar.bz2
nixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.tar.lz
nixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.tar.xz
nixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.tar.zst
nixlib-f5f8f2415e5959933351cbcc8dce3afe20796cfc.zip
Merge pull request #122794 from Mic92/nix-hotfix
nixUnstable: pre20210503_6d2553a -> pre20210513_340f831 
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d808eebcc936..ec5099c5f6ee 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -218,6 +218,13 @@ in rec {
     };
 
     inherit storeDir stateDir confDir boehmgc;
+
+    patches = [
+      (fetchpatch {
+        url = "https://github.com/NixOS/nix/commit/8c7e043de2f673bc355d83f1e873baa93f30be62.patch";
+        sha256 = "sha256-aTcUnZXheewnyCT7yQKnTqQDKS2uDoN9plMQgxJH8Ag=";
+      })
+    ];
   });
 
   nixExperimental = nixUnstable.overrideAttrs (prev: {