diff options
| author | codyopel <codyopel@gmail.com> | 2015-02-24 22:15:51 -0500 |
|---|---|---|
| committer | codyopel <codyopel@gmail.com> | 2015-02-24 22:15:51 -0500 |
| commit | e29b0da9c7492732e0dc5730c3da754baa57a1a2 (patch) | |
| tree | fc6846c97b9634e3e8e4c15464f8562f77da9075 /pkgs/tools/system/tree/default.nix | |
| parent | 6a6cc70978ba84e9de3ae0148cf0ab1b97a4955b (diff) | |
| download | nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.tar nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.tar.gz nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.tar.bz2 nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.tar.lz nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.tar.xz nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.tar.zst nixlib-e29b0da9c7492732e0dc5730c3da754baa57a1a2.zip | |
remove stdenv.isBSD
Diffstat (limited to 'pkgs/tools/system/tree/default.nix')
| -rw-r--r-- | pkgs/tools/system/tree/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 165eb316a928..02834b70d629 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: let version = "1.7.0"; @@ -6,17 +6,17 @@ let # These settings are found in the Makefile, but there seems to be no # way to select one ore the other setting other than editing the file # manually, so we have to duplicate the know how here. - systemFlags = - if stdenv.isDarwin then '' + systemFlags = with stdenv; + if isDarwin then '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS= EXTRA_OBJS=strverscmp.o - '' else if stdenv.isCygwin then '' + '' else if isCygwin then '' CFLAGS="-O2 -Wall -fomit-frame-pointer -DCYGWIN" LDFLAGS=-s TREE_DEST=tree.exe EXTRA_OBJS=strverscmp.o - '' else if stdenv.isBSD then '' + '' else if (isFreeBSD || isOpenBSD) then '' CFLAGS="-O2 -Wall -fomit-frame-pointer" LDFLAGS=-s EXTRA_OBJS=strverscmp.o |