public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29547 from obsidiansystems/cross-suffix

Browse Source 
stdenv: Add back leading '-' in cross derivation name suffix
This commit is contained in:
John Ericson 2017-09-18 19:17:49 -04:00 committed by GitHub
commit 807d8cec97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/generic/make-derivation.nix
View File

@ -97,7 +97,7 @@ rec {
{ {
name = name + lib.optionalString name = name + lib.optionalString
(stdenv.hostPlatform != stdenv.buildPlatform) (stdenv.hostPlatform != stdenv.buildPlatform)
stdenv.hostPlatform.config; ("-" + stdenv.hostPlatform.config);
builder = attrs.realBuilder or stdenv.shell; builder = attrs.realBuilder or stdenv.shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
inherit stdenv; inherit stdenv;