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