Revert "buildSkawarePackage: pass through extra args"

This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b.

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).

+15 -15
+15 -15
pkgs/build-support/skaware/build-skaware-package.nix
··· 18 , configureFlags 19 # mostly for moving and deleting files from the build directory 20 # : lines 21 - , postInstall ? "" 22 - # : lines 23 - , postFixup ? "" 24 # : list Maintainer 25 , maintainers ? [] 26 - # : attrs 27 - , meta ? {} 28 - , ... 29 - } @ args: 30 31 let 32 ··· 53 "README.*" 54 ]; 55 56 - in stdenv.mkDerivation ({ 57 src = fetchurl { 58 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; 59 inherit sha256; 60 }; 61 62 dontDisableStatic = true; 63 enableParallelBuilding = true; 64 ··· 83 noiseFiles = commonNoiseFiles; 84 docFiles = commonMetaFiles; 85 }} $doc/share/doc/${pname} 86 - '' + postInstall; 87 88 postFixup = '' 89 ${cleanPackaging.checkForRemainingFiles} 90 - '' + postFixup; 91 92 meta = { 93 homepage = "https://skarnet.org/software/${pname}/"; ··· 95 license = stdenv.lib.licenses.isc; 96 maintainers = with lib.maintainers; 97 [ pmahoney Profpatsch ] ++ maintainers; 98 - } // meta; 99 100 - } // builtins.removeAttrs args [ 101 - "sha256" "configureFlags" "postInstall" "postFixup" 102 - "meta" "description" "platforms" "maintainers" 103 - ])
··· 18 , configureFlags 19 # mostly for moving and deleting files from the build directory 20 # : lines 21 + , postInstall 22 # : list Maintainer 23 , maintainers ? [] 24 + 25 + 26 + }: 27 28 let 29 ··· 50 "README.*" 51 ]; 52 53 + in stdenv.mkDerivation { 54 + name = "${pname}-${version}"; 55 + 56 src = fetchurl { 57 url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; 58 inherit sha256; 59 }; 60 61 + inherit outputs; 62 + 63 dontDisableStatic = true; 64 enableParallelBuilding = true; 65 ··· 84 noiseFiles = commonNoiseFiles; 85 docFiles = commonMetaFiles; 86 }} $doc/share/doc/${pname} 87 + 88 + ${postInstall} 89 + ''; 90 91 postFixup = '' 92 ${cleanPackaging.checkForRemainingFiles} 93 + ''; 94 95 meta = { 96 homepage = "https://skarnet.org/software/${pname}/"; ··· 98 license = stdenv.lib.licenses.isc; 99 maintainers = with lib.maintainers; 100 [ pmahoney Profpatsch ] ++ maintainers; 101 + }; 102 103 + }