diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-05-19 10:41:10 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-05-19 09:41:10 +0100 |
| commit | 28f8ca560f7c026813f2fd5e0606ca0c6139e7b8 (patch) | |
| tree | 6933b280e0444d23138640f067651a27c1f2b630 /pkgs/build-support/release | |
| parent | da2788c3d723cb66c3df219364b9cb62e596213f (diff) | |
debian-build: fix checkinstall invocation (#15538)
Checkinstall had two problems: 1. when it was called without a version (e.g. with a derivation created by fetchFromGitHub) it would use `src` as debian version, which caused dpkg to fail 2. when dpkg failed, it would invoke the pager with the log, which hangs the build So now 1. the default version is the dummy `0.0.0` 2. the used pager is `cat`
Diffstat (limited to 'pkgs/build-support/release')
| -rw-r--r-- | pkgs/build-support/release/debian-build.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 7dcc9b9552a48..f4bc3e73056dc 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -54,11 +54,15 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( eval "$preInstall" export LOGNAME=root + # otherwise build hangs when it wants to display + # the log file + export PAGER=cat ${checkinstall}/sbin/checkinstall --nodoc -y -D \ --fstrans=${if fsTranslation then "yes" else "no"} \ --requires="${concatStringsSep "," debRequires}" \ --provides="${concatStringsSep "," debProvides}" \ - ${optionalString (src ? version) "--pkgversion=$(echo ${src.version} | tr _ -)"} \ + ${if (src ? version) then "--pkgversion=$(echo ${src.version} | tr _ -)" + else "--pkgversion=0.0.0"} \ ''${debMaintainer:+--maintainer="'$debMaintainer'"} \ ''${debName:+--pkgname="'$debName'"} \ $checkInstallFlags \ |