pyrox.dev
expand-response-params: Pull out of cc-wrapper
No hashes were changed
+4
-12
pkgs/build-support/cc-wrapper/default.nix
+4
-12
pkgs/build-support/cc-wrapper/default.nix
···
74
74
else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
75
75
else null;
76
76
77
-
expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
78
-
then buildPackages.stdenv.mkDerivation {
79
-
name = "expand-response-params";
80
-
src = ./expand-response-params.c;
81
-
buildCommand = ''
82
-
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
83
-
cp "$src" expand-response-params.c
84
-
"$CC" -std=c99 -O3 -o "$out" expand-response-params.c
85
-
strip -S $out
86
-
${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
87
-
'';
88
-
} else "";
77
+
expand-response-params =
78
+
if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
79
+
then import ../expand-response-params { inherit (buildPackages) stdenv; }
80
+
else "";
89
81
90
82
in
91
83
pkgs/build-support/cc-wrapper/expand-response-params.c
pkgs/build-support/expand-response-params/expand-response-params.c
pkgs/build-support/cc-wrapper/expand-response-params.c
pkgs/build-support/expand-response-params/expand-response-params.c
+13
pkgs/build-support/expand-response-params/default.nix
+13
pkgs/build-support/expand-response-params/default.nix
···
1
+
{ stdenv }:
2
+
3
+
stdenv.mkDerivation {
4
+
name = "expand-response-params";
5
+
src = ./expand-response-params.c;
6
+
buildCommand = ''
7
+
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
8
+
cp "$src" expand-response-params.c
9
+
"$CC" -std=c99 -O3 -o "$out" expand-response-params.c
10
+
strip -S $out
11
+
${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"}
12
+
'';
13
+
}