From 0a16269198bdc71109e5c8b77b7e3ed5e601bdab Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 31 Dec 2016 02:13:04 +0400
Subject: Revert "releaseTools.debBuild: split checkinstall into separate
 phase"

---
 pkgs/build-support/release/debian-build.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'pkgs/build-support/release/debian-build.nix')

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 74e061966bc..f4bc3e73056 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -16,14 +16,17 @@ 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" ];
-    postPhases = [ "debInstallPhase" ];
+    prePhases = "installExtraDebsPhase sysInfoPhase";
+  }
+
+  // removeAttrs args ["vmTools"] //
+
+  {
+    name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
 
     # !!! cut&paste from rpm-build.nix
     postHook = ''
@@ -69,12 +72,6 @@ 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
@@ -90,12 +87,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
         echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
       done
 
-      eval "$postDebInstall"
+      eval "$postInstall"
     ''; # */
 
     meta = (if args ? meta then args.meta else {}) // {
       description = "Deb package for ${diskImage.fullName}";
     };
-  } // removeAttrs args ["name" "meta" "vmTools"]
+  }
 
 ))
-- 
cgit 1.4.1