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

Merge pull request #109600 from holymonson/unixtools

Browse Source 
unixtools: use real provider name instead of inaccurate version
This commit is contained in:
Jörg Thalheim 2021-07-17 06:35:04 +01:00 committed by GitHub
commit 8e4bb160cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/unixtools.nix
View File

@ -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
'';