diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-23 16:23:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-25 11:21:09 -0400 |
| commit | 287fce6402100c40317233de6b4f749f2b79b0a5 (patch) | |
| tree | 845fac8eeaba363f5ddd3dcc720a5dd7b61f36de /pkgs/build-support | |
| parent | 2e7a3902122a269d751e31823c1c6c6b3ffa5c9b (diff) | |
| download | nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.tar nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.tar.gz nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.tar.bz2 nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.tar.lz nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.tar.xz nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.tar.zst nixpkgs-287fce6402100c40317233de6b4f749f2b79b0a5.zip | |
expand-response-params: Pull out of cc-wrapper
No hashes were changed
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/build-support/expand-response-params/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/build-support/expand-response-params/expand-response-params.c (renamed from pkgs/build-support/cc-wrapper/expand-response-params.c) | 0 |
3 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 525cb07ac32..d5ae64c9c5f 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -74,18 +74,10 @@ let else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; - expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" - then buildPackages.stdenv.mkDerivation { - name = "expand-response-params"; - src = ./expand-response-params.c; - buildCommand = '' - # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c" - cp "$src" expand-response-params.c - "$CC" -std=c99 -O3 -o "$out" expand-response-params.c - strip -S $out - ${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"} - ''; - } else ""; + expand-response-params = + if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + then import ../expand-response-params { inherit (buildPackages) stdenv; } + else ""; in diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix new file mode 100644 index 00000000000..7afbb727fc3 --- /dev/null +++ b/pkgs/build-support/expand-response-params/default.nix @@ -0,0 +1,13 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "expand-response-params"; + src = ./expand-response-params.c; + buildCommand = '' + # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c" + cp "$src" expand-response-params.c + "$CC" -std=c99 -O3 -o "$out" expand-response-params.c + strip -S $out + ${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"} + ''; +} diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/expand-response-params/expand-response-params.c index 05b9c62b1e8..05b9c62b1e8 100644 --- a/pkgs/build-support/cc-wrapper/expand-response-params.c +++ b/pkgs/build-support/expand-response-params/expand-response-params.c |