From a7824368c26ae1809a36495f870ea7a625c55206 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 9 Oct 2013 15:00:45 +0200
Subject: [PATCH] Fix setting of .version-suffix

---
 nixos/release.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 2af43ab5b87..8409ca87717 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -85,13 +85,13 @@ in {
       expr = builtins.readFile lib/channel-expr.nix;
 
       distPhase = ''
+        rm -rf .git
         echo -n $VERSION_SUFFIX > .version-suffix
         releaseName=nixos-$VERSION$VERSION_SUFFIX
         mkdir -p $out/tarballs
         mkdir ../$releaseName
-        cp -prd ${nixpkgs} ../$releaseName/nixpkgs
+        cp -prd . ../$releaseName/nixpkgs
         chmod -R u+w ../$releaseName
-        rm -rf .git
         ln -s nixpkgs/nixos ../$releaseName/nixos
         echo "$expr" > ../$releaseName/default.nix
         NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null