@@ -16,17 +16,14 @@ with stdenv.lib;
1616vmTools.runInLinuxImage (stdenv.mkDerivation (
1717
1818 {
19+ name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
20+
1921 doCheck = true;
2022
2123 prefix = "/usr";
2224
23− prePhases = "installExtraDebsPhase sysInfoPhase";
24− }
25−
26− // removeAttrs args ["vmTools"] //
27−
28− {
29− name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
25+ prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ];
26+ postPhases = [ "debInstallPhase" ];
3027
3128 # !!! cut&paste from rpm-build.nix
3229 postHook = ''
@@ -72,6 +69,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
7269 mkdir -p $out/debs
7370 find . -name "*.deb" -exec cp {} $out/debs \;
7471
72+ eval "$postInstall"
73+ '';
74+
75+ debInstallPhase = ''
76+ eval "$preDebInstall"
77+
7578 [ "$(echo $out/debs/*.deb)" != "" ]
7679
7780 for i in $out/debs/*.deb; do
@@ -87,12 +90,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
8790 echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
8891 done
8992
90− eval "$postInstall"
93+ eval "$postDebInstall"
9194 ''; # */
9295
9396 meta = (if args ? meta then args.meta else {}) // {
9497 description = "Deb package for ${diskImage.fullName}";
9598 };
96− }
99+ } // removeAttrs args ["name" "meta" "vmTools"]
97100
98101))