about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-12-11 04:01:11 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-12-11 04:01:11 +0100
commit653a3515f3db49ab76c901d003cc64b2913256bb (patch)
tree87d4daaaa41d6568f0abab623bd803d8aa1392f7 /modules
parentac36609cdc6f00c60168a176dfc1391d07ff0ed8 (diff)
profiles/base: Remove patch for nixUnstable.
This reverts commit c4915296f064587b7ead2c8ddb7bf42aeca522dc.

We no longer need this because the nixUnstable version has been updated
in NixOS/nixpkgs@2de76b275366a700f7f79709bf30d67358f2838a.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/base.nix11
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix
index 779edd21..d7841dd4 100644
--- a/modules/user/aszlig/profiles/base.nix
+++ b/modules/user/aszlig/profiles/base.nix
@@ -73,21 +73,14 @@ in {
 
       allowBroken = true;
 
-      packageOverrides = pkgs: rec {
-        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";
-          });
-        });
+      packageOverrides = pkgs: {
         miro = pkgs.miro.override {
           enableBonjour = true;
         };
         netrw = pkgs.netrw.override {
           checksumType = "mhash";
         };
-        nix = nixUnstable;
+        nix = pkgs.nixUnstable;
         uqm = pkgs.uqm.override {
           use3DOVideos = true;
           useRemixPacks = true;