From 2f5576b5392b407b909db871f1308c9af85f2df9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Mar 2013 14:44:24 +0100
Subject: Grmbl

---
 release-combined.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'release-combined.nix')

diff --git a/release-combined.nix b/release-combined.nix
index b26a2184ddb..3a378123d2c 100644
--- a/release-combined.nix
+++ b/release-combined.nix
@@ -1,17 +1,20 @@
 { nixosSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdefg"; }
-, nixpkgsSrc ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
+, nixpkgs ? { outPath = <nixpkgs>; revCount = 5678; shortRev = "gfedcba"; }
 , officialRelease ? false
 }:
 
+let nixpkgs' = nixpkgs; in # urgh
+
 rec {
 
   nixos = import ./release.nix {
-    inherit nixosSrc nixpkgsSrc officialRelease;
+    inherit nixosSrc officialRelease;
+    nixpkgs = nixpkgs';
   };
 
   nixpkgs = import <nixpkgs/pkgs/top-level/release.nix> {
     inherit officialRelease;
-    nixpkgs = nixpkgsSrc;
+    nixpkgs = nixpkgs';
     # Only do Linux builds.
     supportedSystems = [ "x86_64-linux" "i686-linux" ];
   };
-- 
cgit 1.4.1