summary refs log tree commit diff
path: root/pkgs/top-level/unixtools.nix
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2021-08-02 17:08:40 +0200
committerGitHub <noreply@github.com>2021-08-02 17:08:40 +0200
commit15ffca434eb8c47d472c3508abe10616022b31a4 (patch)
treeb0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/top-level/unixtools.nix
parenta476da069049bbdd1630ba1bc66e0ba0512cff15 (diff)
parent5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff)
downloadnixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst
nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/top-level/unixtools.nix')
-rw-r--r--pkgs/top-level/unixtools.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix
index b4f708ad565..b7fea20b76b 100644
--- a/pkgs/top-level/unixtools.nix
+++ b/pkgs/top-level/unixtools.nix
@@ -19,7 +19,7 @@ let
       provider = providers.${stdenv.hostPlatform.parsed.kernel.name} or providers.linux;
       bin = "${getBin provider}/bin/${cmd}";
       manpage = "${getOutput "man" provider}/share/man/man1/${cmd}.1.gz";
-    in runCommand "${cmd}-${version}" {
+    in runCommand "${cmd}-${provider.name}" {
       meta = {
         priority = 10;
         platforms = lib.platforms.${stdenv.hostPlatform.parsed.kernel.name} or lib.platforms.all;
@@ -43,7 +43,7 @@ let
 
   # more is unavailable in darwin
   # so we just use less
-  more_compat = runCommand "more-${version}" {} ''
+  more_compat = runCommand "more-${pkgs.less.name}" {} ''
     mkdir -p $out/bin
     ln -s ${pkgs.less}/bin/less $out/bin/more
   '';