nix: apply NixOS/nix#2409

serokell · Apr 23, 2019 · e5cf719 · e5cf719
1 parent 3a7b1d3
commit e5cf719
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
@@ -3,6 +3,7 @@
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
 , boehmgc
+, fetchpatch
 }:
 
 let
@@ -166,15 +167,23 @@ in rec {
     inherit storeDir stateDir confDir boehmgc;
   };
 
-  nixStable = callPackage common rec {
+  nixStable = (callPackage common rec {
     name = "nix-2.2.2";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
       sha256 = "f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c";
     };
 
     inherit storeDir stateDir confDir boehmgc;
-  };
+  }).overrideAttrs (super: {
+    patches = [
+      # fetchGit rev = "*"
+      (fetchpatch {
+        url = "https://github.com/NixOS/nix/commit/4b279a099f19bd13a98fa2ae519c4aa263bb6b6e.patch";
+        sha256 = "0sisavs3x2p37hrmhnhvhh2rzb0qyjvvd4y0azk25329wylqnw88";
+      })
+    ];
+  });
 
   nixUnstable = lib.lowPrio (callPackage common rec {
     name = "nix-2.3${suffix}";