1 files changed, 10 insertions, 19 deletions
diff --git a/pkgs/build-support/vm/deb/deb-closure.nix b/pkgs/build-support/vm/deb/deb-closure.nix
index 64db0307ffa36..6559233417239 100644
--- a/pkgs/build-support/vm/deb/deb-closure.nix
+++ b/pkgs/build-support/vm/deb/deb-closure.nix
@@ -1,14 +1,13 @@
-with import ../../../nixpkgs {};
+with import ../../../.. {};
 
 rec {
 
   debClosureGenerator =
     {name, packages, urlPrefix, toplevel}:
-    runCommand name {} ''
-      ensureDir $out
+    runCommand "${name}.nix" {} ''
       bunzip2 < ${packages} > ./Packages
       ${perl}/bin/perl -I${dpkg} -w ${./deb-closure.pl} \
-        ./Packages ${urlPrefix} ${toString toplevel} > $out/${name}.nix
+        ./Packages ${urlPrefix} ${toString toplevel} > $out
     '';
 
 
@@ -34,14 +33,14 @@ rec {
   
   # Ubuntu 7.10 "Gutsy Gibbon", i386.
 
-  packagesUbuntuGutsyI386 = fetchurl {
+  ubuntu710i386Packages = fetchurl {
     url = mirror://ubuntu/dists/gutsy/main/binary-i386/Packages.bz2;
     sha1 = "8b52ee3d417700e2b2ee951517fa25a8792cabfd";
   };
 
-  debsUbuntuGutsyI386 = debClosureGenerator {
+  ubuntu710i386Debs = debClosureGenerator {
     name = "ubuntu-7.10-gutsy-i386";
-    packages = packagesUbuntuGutsyI386;
+    packages = ubuntu710i386Packages;
     urlPrefix = mirror://ubuntu;
     toplevel = commonPackages;
   };
@@ -49,25 +48,17 @@ rec {
 
   # Debian 4.0r3 "Etch", i386.
 
-  packagesDebianEtchR3I386 = fetchurl {
+  debian40r3i386Packages = fetchurl {
     url = mirror://debian/dists/etch/main/binary-i386/Packages.bz2;
     sha256 = "7a8f2777315d71fd7321d1076b3bf5f76afe179fe66c2ce8e1ff4baed6424340";
   };
 
-  debsDebianEtchR3I386 = debClosureGenerator {
+  debian40r3i386Debs = debClosureGenerator {
     name = "debian-4.0r3-etch-i386";
-    packages = packagesDebianEtchR3I386;
+    packages = debian40r3i386Packages;
     urlPrefix = mirror://debian;
     toplevel = commonPackages;
   };
 
-
-  # To update the Nix expressions for all distributions, do
-  # $ nix-build deb-closure.nix -A allDists
-  # $ cp -f result*/*.nix .
-  allDists = [
-    debsUbuntuGutsyI386
-    debsDebianEtchR3I386
-  ];
-
+  
 }