* checkinstall: build properly on x86_64.

* checkinstall: get rid of the RUNPATH in the LD_PRELOAD library so
  that it works with native Glibc (e.g. in VM builds).
* debBuild: use our own checkinstall.  In particular this allows us to
  build Debs on x86_64.

svn path=/nixpkgs/trunk/; revision=13608

2 files changed, 4 insertions, 9 deletions

diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index fad216fb1c24a..fad88a98f177e 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -34,13 +34,6 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
       fi
     ''; # */
 
-    extraDebs = [
-      (fetchurl {
-        url = http://checkinstall.izto.org/files/deb/checkinstall_1.6.1-1_i386.deb;
-        sha256 = "0c9wwk1m0w677gr37zd4lhvkskkcrwa0bk7csh7b3qy94pnab618";
-      })
-    ];
-
     installExtraDebsPhase = ''
       for i in $extraDebs; do
         dpkg --install $i    
@@ -56,7 +49,9 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
     '';
 
     installCommand = ''
-      /usr/local/sbin/checkinstall -y -D make install
+      export LOGNAME=root
+    
+      ${checkinstall}/sbin/checkinstall -y -D make install
 
       ensureDir $out/debs
       find . -name "*.deb" -exec cp {} $out/debs \;
diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix
index e3ea97876f468..58368bddf6be2 100644
--- a/pkgs/build-support/release/default.nix
+++ b/pkgs/build-support/release/default.nix
@@ -21,7 +21,7 @@ rec {
   rpmBuild = args: import ./rpm-build.nix vmTools args;
 
   debBuild = args: import ./debian-build.nix {inherit vmTools fetchurl;} (
-    { inherit stdenv;
+    { inherit stdenv checkinstall;
     } // args);
 
 }