Merge pull request #20767 from abbradar/debbuild

releaseTools.debBuild: split checkinstall into separate phase

1 files changed, 12 insertions, 9 deletions

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index f4bc3e73056d..74e061966bca 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -16,17 +16,14 @@ with stdenv.lib;
 vmTools.runInLinuxImage (stdenv.mkDerivation (
 
   {
+    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
+
     doCheck = true;
 
     prefix = "/usr";
 
-    prePhases = "installExtraDebsPhase sysInfoPhase";
-  }
-
-  // removeAttrs args ["vmTools"] //
-
-  {
-    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
+    prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ];
+    postPhases = [ "debInstallPhase" ];
 
     # !!! cut&paste from rpm-build.nix
     postHook = ''
@@ -72,6 +69,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
       mkdir -p $out/debs
       find . -name "*.deb" -exec cp {} $out/debs \;
 
+      eval "$postInstall"
+    '';
+
+    debInstallPhase = ''
+      eval "$preDebInstall"
+
       [ "$(echo $out/debs/*.deb)" != "" ]
 
       for i in $out/debs/*.deb; do
@@ -87,12 +90,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
       done
 
-      eval "$postInstall"
+      eval "$postDebInstall"
     ''; # */
 
     meta = (if args ? meta then args.meta else {}) // {
       description = "Deb package for ${diskImage.fullName}";
     };
-  }
+  } // removeAttrs args ["name" "meta" "vmTools"]
 
 ))