From 86b11d5bb0661f8e210ae97be81458ef59c08679 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 28 Apr 2015 10:00:07 +0200 Subject: release.nix: Use vuizvui/nixpkgs in nixos-rebuild. We're now symlinking the nixpkgs store path into vuizvui/nixpkgs and reference it from within nixos-rebuild. Unfortunately we can't simply patch it with the hardcoded store path because we'll end up having the *previous* version on every nixos-rebuild instead of the new version delivered by the channel. Signed-off-by: aszlig --- release.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'release.nix') diff --git a/release.nix b/release.nix index 8ff1d073..320dc217 100644 --- a/release.nix +++ b/release.nix @@ -19,7 +19,10 @@ let src = nixpkgs; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; installPhase = "cp -r . \"$out\""; - patchPhase = patchNixpkgsReference "'\"$out\"'"; + patchPhase = (patchNixpkgsReference "'\"$out\"'") + '' + sed -i -re 's!]*)>!!g' \ + nixos/modules/installer/tools/nixos-rebuild.sh + ''; }; in with pkgsUpstream.lib; with builtins; { @@ -44,7 +47,9 @@ in with pkgsUpstream.lib; with builtins; { name = "vuizvui-channel-${attrs.name or "generic"}-${version}"; version = "${toString vuizvui.revCount}.${vuizvui.shortRev}"; src = vuizvui; - patchPhase = patchNixpkgsReference patchedNixpkgs; + patchPhase = (patchNixpkgsReference patchedNixpkgs) + '' + ln -s "${patchedNixpkgs}" nixpkgs + ''; } // removeAttrs attrs [ "name" ]); in { -- cgit 1.4.1