Revert "buildSkawarePackage: pass through extra args"

This reverts commit a50653295d.

The reasons cited were “debugging”, in which case
you can just add the attribute to `buildSkawarePackage`
and “customizing”, which is still possible with
a normal `overrideDerivation`.

The patch removed `outputs` for some reason
(possible oversight), so building nsss failed.
Plus lots of complexity (e.g. don’t forget to add new
arguments to `removeAttrs` otherwise there’s a bug now).
This commit is contained in:
Profpatsch 2020-03-22 21:58:11 +01:00
parent 8edd400bfb
commit 894c74da1f

View File

@ -18,15 +18,12 @@ in {
, configureFlags
# mostly for moving and deleting files from the build directory
# : lines
, postInstall ? ""
# : lines
, postFixup ? ""
, postInstall
# : list Maintainer
, maintainers ? []
# : attrs
, meta ? {}
, ...
} @ args:
}:
let
@ -53,12 +50,16 @@ let
"README.*"
];
in stdenv.mkDerivation ({
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
inherit sha256;
};
inherit outputs;
dontDisableStatic = true;
enableParallelBuilding = true;
@ -83,11 +84,13 @@ in stdenv.mkDerivation ({
noiseFiles = commonNoiseFiles;
docFiles = commonMetaFiles;
}} $doc/share/doc/${pname}
'' + postInstall;
${postInstall}
'';
postFixup = ''
${cleanPackaging.checkForRemainingFiles}
'' + postFixup;
'';
meta = {
homepage = "https://skarnet.org/software/${pname}/";
@ -95,9 +98,6 @@ in stdenv.mkDerivation ({
license = stdenv.lib.licenses.isc;
maintainers = with lib.maintainers;
[ pmahoney Profpatsch ] ++ maintainers;
} // meta;
};
} // builtins.removeAttrs args [
"sha256" "configureFlags" "postInstall" "postFixup"
"meta" "description" "platforms" "maintainers"
])
}