diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-01-16 10:59:27 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-01-16 10:59:27 +0000 |
| commit | c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74 (patch) | |
| tree | 904516c8b572724b240f93e7901d324caf12daa3 /pkgs/build-support/release | |
| parent | 821de7706a4a44d919c95f0e990ac01840788c94 (diff) | |
| parent | 4eedf7dae894a40f6c70cc80735f1500ded9bff3 (diff) | |
| download | nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.tar nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.tar.gz nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.tar.bz2 nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.tar.lz nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.tar.xz nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.tar.zst nixlib-c1579d2e78f76e7ad3b30cc2961fafe7b8a24a74.zip | |
* stdenv branch: synced with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13785
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/debian-build.nix | 11 | ||||
| -rw-r--r-- | pkgs/build-support/release/default.nix | 2 |
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 fad216fb1c24..fad88a98f177 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 65813ef9cabb..789def4ddffc 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -20,7 +20,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); } |