diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-12-31 02:13:48 +0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-31 02:13:48 +0400 |
commit | fad0eae6bb62e6f9c7a87637671d17efd18338dc (patch) | |
tree | a71a39ccec9c7ca88870522e276ca7ceae9ce316 /pkgs | |
parent | 8f961e8b14a0b183845196047e466cfb537c2c91 (diff) | |
parent | 0a16269198bdc71109e5c8b77b7e3ed5e601bdab (diff) | |
download | nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.tar nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.tar.gz nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.tar.bz2 nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.tar.lz nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.tar.xz nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.tar.zst nixlib-fad0eae6bb62e6f9c7a87637671d17efd18338dc.zip |
Merge pull request #21530 from NixOS/revert-20767-debbuild
Revert "releaseTools.debBuild: split checkinstall into separate phase"
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/release/debian-build.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 74e061966bca..f4bc3e73056d 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"] + } )) |