From 653a3515f3db49ab76c901d003cc64b2913256bb Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 11 Dec 2015 04:01:11 +0100 Subject: 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 --- modules/user/aszlig/profiles/base.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'modules/user') 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; -- cgit 1.4.1