about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-12-01 12:56:11 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-12-01 12:56:11 +0100
commitc4915296f064587b7ead2c8ddb7bf42aeca522dc (patch)
treea4bcffa059a3c1fcefdf9502aeadb801458cd30c /modules
parent0065eaa8dc4afefb3e3943d83098a3ec2007f2bb (diff)
profiles/base: Don't require libSystem in Nix.
I'm using nixUnstable and without fiddling around, updating the channel
or installing anything into a user environment is going to fail with a
request of the impure paths /usr/lib/libSystem.dylib and
/usr/lib/system.

This patch is from NixOS/nix#688 and I'll keep it until the Nix tests on
Hydra are succeeding and we can update nixUnstable in <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/base.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index f183f00b..3a99fc42 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -74,6 +74,13 @@ in {
       allowBroken = true;
 
       packageOverrides = pkgs: {
+        nixUnstable = pkgs.lib.overrideDerivation pkgs.nixUnstable (drv: {
+          patches = (drv.patches or []) ++ lib.singleton (pkgs.fetchpatch {
+            url = "https://github.com/NixOS/nix/commit/"
+                + "8a76bc9fb0918548b9bffaa39105ac63135d1c5d.patch";
+            sha256 = "0ijiwcln7zh2321gdsad8cm44b66qdcg5l2gmz2qm4qw9y902cpc";
+          });
+        });
         miro = pkgs.miro.override {
           enableBonjour = true;
         };