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