From 143978a477e4891bd94be6d9fcf257f726b403cd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 3 May 2018 00:58:11 -0500 Subject: treewide: remove platform assertions linux: readd assertion --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git-recent/default.nix | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/version-management') 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; { -- cgit 1.4.1