Merge pull request #112073 from ztzg/x-16304-debbuild-checkinstall

This commit is contained in:
Sandro 2021-03-21 05:35:45 +01:00 committed by GitHub
commit 6cecff003a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,7 +3,7 @@
{ name ? "debian-build" { name ? "debian-build"
, diskImage , diskImage
, src, lib, stdenv, vmTools, checkinstall , src, stdenv, vmTools, checkinstall
, fsTranslation ? false , fsTranslation ? false
, # Features provided by this package. , # Features provided by this package.
debProvides ? [] debProvides ? []
@ -21,7 +21,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
prePhases = "installExtraDebsPhase sysInfoPhase"; prePhases = "installExtraDebsPhase sysInfoPhase";
} }
// removeAttrs args ["vmTools"] // // removeAttrs args ["vmTools" "lib"] //
{ {
name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else "");