From 24bfade707610cf1789368041af9305a83a6ffa4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 30 Jun 2015 19:36:43 +0200
Subject: release.nix: Don't patch <nixpkgs> anymore.

Since d2ff1a9, we now set a new NIX_PATH instead of patching <nixpkgs>,
which is way less error-prone and get less unexpecting results if we
evaluate against an unmodified <nixpkgs>.

So, patching <nixpkgs> is obsolete and thus removed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 release.nix | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'release.nix')

diff --git a/release.nix b/release.nix
index 32f73a24..9b83605c 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
 { vuizvuiSrc ? null
-, nixpkgsSrc ? null
+, nixpkgsSrc ? <nixpkgs>
 , supportedSystems ? [ "i686-linux" "x86_64-linux" ]
 }:
 
@@ -8,20 +8,7 @@ let
   nixpkgsShortRev = nixpkgsSrc.shortRev or "abcdefg";
   nixpkgsVersion = "pre${toString nixpkgsRevCount}.${nixpkgsShortRev}-vuizvui";
 
-  nixpkgs = let
-    patchedNixpkgs = (import nixpkgsSrc {}).stdenv.mkDerivation {
-      name = "nixpkgs-${nixpkgsVersion}";
-      src = nixpkgsSrc;
-      phases = [ "unpackPhase" "installPhase" ];
-      installPhase = ''
-        sed -i -r \
-          -e 's!<nixpkgs([^>]*)>!<vuizvui/nixpkgs\1>!g' \
-          -e 's!(--find-file *['"'"'"]?)nixpkgs!\1vuizvui/nixpkgs!g' \
-          nixos/modules/installer/tools/nixos-rebuild.sh
-        cp -r . "$out"
-      '';
-    };
-  in if nixpkgsSrc == null then <nixpkgs> else patchedNixpkgs;
+  nixpkgs = nixpkgsSrc;
 
   vuizvuiRevCount = vuizvuiSrc.revCount or 12345;
   vuizvuiShortRev = vuizvuiSrc.shortRev or "abcdefg";
-- 
cgit 1.4.1