@@ -16,14 +16,17 @@ with stdenv.lib;
1616vmTools.runInLinuxImage (stdenv.mkDerivation (
1717
1818 {
19− name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
20−
2119 doCheck = true;
2220
2321 prefix = "/usr";
2422
25− prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ];
26− postPhases = [ "debInstallPhase" ];
23+ prePhases = "installExtraDebsPhase sysInfoPhase";
24+ }
25+
26+ // removeAttrs args ["vmTools"] //
27+
28+ {
29+ name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
2730
2831 # !!! cut&paste from rpm-build.nix
2932 postHook = ''
@@ -69,12 +72,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
6972 mkdir -p $out/debs
7073 find . -name "*.deb" -exec cp {} $out/debs \;
7174
72− eval "$postInstall"
73− '';
74−
75− debInstallPhase = ''
76− eval "$preDebInstall"
77−
7875 [ "$(echo $out/debs/*.deb)" != "" ]
7976
8077 for i in $out/debs/*.deb; do
@@ -90,12 +87,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
9087 echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
9188 done
9289
93− eval "$postDebInstall"
90+ eval "$postInstall"
9491 ''; # */
9592
9693 meta = (if args ? meta then args.meta else {}) // {
9794 description = "Deb package for ${diskImage.fullName}";
9895 };
99− } // removeAttrs args ["name" "meta" "vmTools"]
96+ }
10097
10198))