dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

releaseTools.debBuild: split checkinstall into separate phase and allow to override them

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-11-28 14:52:41 +03:00
parent 04edf297cc
commit 41fcb036eb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/build-support/release/debian-build.nix
View File

@ -16,17 +16,14 @@ with stdenv.lib;
vmTools.runInLinuxImage (stdenv.mkDerivation ( vmTools.runInLinuxImage (stdenv.mkDerivation (
{ {
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
doCheck = true; doCheck = true;
prefix = "/usr"; prefix = "/usr";
prePhases = "installExtraDebsPhase sysInfoPhase"; prePhases = [ "installExtraDebsPhase" "sysInfoPhase" ];
} postPhases = [ "debInstallPhase" ];
// removeAttrs args ["vmTools"] //
{
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");
# !!! cut&paste from rpm-build.nix # !!! cut&paste from rpm-build.nix
postHook = '' postHook = ''
@ -72,6 +69,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
mkdir -p $out/debs mkdir -p $out/debs
find . -name "*.deb" -exec cp {} $out/debs \; find . -name "*.deb" -exec cp {} $out/debs \;
eval "$postInstall"
'';
debInstallPhase = ''
eval "$preDebInstall"
[ "$(echo $out/debs/*.deb)" != "" ] [ "$(echo $out/debs/*.deb)" != "" ]
for i in $out/debs/*.deb; do for i in $out/debs/*.deb; do
@ -87,12 +90,12 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
done done
eval "$postInstall" eval "$postDebInstall"
''; # */ ''; # */
meta = (if args ? meta then args.meta else {}) // { meta = (if args ? meta then args.meta else {}) // {
description = "Deb package for ${diskImage.fullName}"; description = "Deb package for ${diskImage.fullName}";
}; };
} } // removeAttrs args ["name" "meta" "vmTools"]
)) ))