diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-06-30 19:36:43 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-06-30 19:36:43 +0200 |
commit | 24bfade707610cf1789368041af9305a83a6ffa4 (patch) | |
tree | 6a1a4a9e2b33c92d9b6c4cc6a8c066ac81b219f3 /release.nix | |
parent | 7f571b3812aef134055d152479765b42878530dc (diff) |
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>
Diffstat (limited to 'release.nix')
-rw-r--r-- | release.nix | 17 |
1 files changed, 2 insertions, 15 deletions
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"; |