about summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-05-03 00:58:11 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-05-03 13:09:20 -0500
commit143978a477e4891bd94be6d9fcf257f726b403cd (patch)
treeb93f545ca15d5dd7410e7ec13be3df1709b935c6 /pkgs/applications/version-management
parent3216cf6cdf5a9d0e77af10add1a9cd5c0d6106c2 (diff)
downloadnixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar
nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.gz
nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.bz2
nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.lz
nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.xz
nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.zst
nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.zip
treewide: remove platform assertions
linux: readd assertion
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-recent/default.nix12
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; {