Merge pull request #21530 from NixOS/revert-20767-debbuild
Revert "releaseTools.debBuild: split checkinstall into separate phase"
This commit is contained in:
commit
fad0eae6bb
|
@ -16,14 +16,17 @@ 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 = ''
|
||||||
|
@ -69,12 +72,6 @@ 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
|
||||||
|
@ -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
|
echo "file deb-extra $(ls $i/debs/*.deb | sort | head -1)" >> $out/nix-support/hydra-build-products
|
||||||
done
|
done
|
||||||
|
|
||||||
eval "$postDebInstall"
|
eval "$postInstall"
|
||||||
''; # */
|
''; # */
|
||||||
|
|
||||||
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"]
|
}
|
||||||
|
|
||||||
))
|
))
|
||||||
|
|
Loading…
Reference in a new issue