diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:24:30 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-03 16:35:36 -0400 |
commit | cf06e42d1cad2732ca23264dee19bbc0d7172b3b (patch) | |
tree | 624d0854c8f07c4d3ba2eb28590076b0486684a3 /pkgs/applications/version-management/git-and-tools | |
parent | cbe21ac614285160a18fe21b8a804f3a2f80c51b (diff) | |
parent | b45ef79b74d267891a11c1775a473c610ecebe78 (diff) | |
download | nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.gz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.bz2 nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.lz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.xz nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.tar.zst nixlib-cf06e42d1cad2732ca23264dee19bbc0d7172b3b.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-recent/default.nix | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 73659a32f4bf..2bd8697c8ec1 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -82,7 +82,7 @@ rec { git-radar = callPackage ./git-radar { }; git-recent = callPackage ./git-recent { - utillinux = if stdenv.isLinux then utillinuxMinimal else null; + utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux; }; git-remote-hg = callPackage ./git-remote-hg { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 0272d4414607..82bcbf74a9eb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -1,15 +1,9 @@ {stdenv, git, less, fetchFromGitHub, makeWrapper # utillinuxMinimal is included because we need the column command -, utillinux ? null +, utillinux }: -assert stdenv.isLinux -> utillinux != null; - -let - binpath = stdenv.lib.makeBinPath - ([ git less ] - ++ stdenv.lib.optional (utillinux != null) utillinux); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "git-recent-${version}"; version = "1.0.4"; @@ -28,7 +22,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${binpath}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}" ''; meta = with stdenv.lib; { |