Skip to content

Commit

Permalink
stdenv: Add back leading '-' in cross derivation name suffix
Browse files Browse the repository at this point in the history
I messed this up when I moved the logic from `makeStdenvCross` in
e826a6a.
  • Loading branch information
Ericson2314 committed Sep 18, 2017
1 parent 77bd631 commit 51179c6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/stdenv/generic/make-derivation.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ rec {
{
name = name + lib.optionalString
(stdenv.hostPlatform != stdenv.buildPlatform)
stdenv.hostPlatform.config;
("-" + stdenv.hostPlatform.config);
builder = attrs.realBuilder or stdenv.shell;
args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)];
inherit stdenv;
Expand Down

2 comments on commit 51179c6

@matthewbauer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think this is right naming behavior? I feel like it would be better to use something like appendToName which keep the version string as the last part.

@Ericson2314
Copy link
Member Author

@Ericson2314 Ericson2314 commented on 51179c6 Jun 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that sounds better. I don't really like version parsing, but there's no reason to break it. Good idea!

Please sign in to comment.