diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-25 16:32:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 16:32:48 -0500 |
| commit | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (patch) | |
| tree | 745ae7c1d7e5f666ccb2fa3fa038bfb0e51bd011 /pkgs/top-level/unix-tools.nix | |
| parent | 11d26c797fb4010f5cae07848902e7fad8a9d3a9 (diff) | |
| parent | ee8fa757f36b80a34fa97f8ee686f92abe742cf1 (diff) | |
Merge pull request #41009 from matthewbauer/normalize-names
Add versions to packages missing it
Diffstat (limited to 'pkgs/top-level/unix-tools.nix')
| -rw-r--r-- | pkgs/top-level/unix-tools.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index c42cf8aa0267..c057aa45be6f 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -12,9 +12,11 @@ # input, not "procps" which requires Linux. let + version = "1003.1-2008"; + singleBinary = cmd: providers: let provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}"; - in runCommand cmd { + in runCommand "${cmd}-${version}" { meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers); } '' mkdir -p $out/bin @@ -29,7 +31,7 @@ let # more is unavailable in darwin # just use less - more_compat = runCommand "more" {} '' + more_compat = runCommand "more-${version}" {} '' mkdir -p $out/bin ln -s ${pkgs.less}/bin/less $out/bin/more ''; @@ -142,7 +144,7 @@ let }; makeCompat = name': value: buildEnv { - name = name' + "-compat"; + name = name' + "-compat-${version}"; paths = value; }; |