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

libiconv: cleanup - no more double callPackage

Browse Source
This commit is contained in:
Vladimír Čunát 2015-03-16 16:39:22 +01:00
parent 01d1ec25f7
commit eaa362db6e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

@ -1399,7 +1399,6 @@ let
gifsicle = callPackage ../tools/graphics/gifsicle { }; gifsicle = callPackage ../tools/graphics/gifsicle { };
gitlab = callPackage ../applications/version-management/gitlab { gitlab = callPackage ../applications/version-management/gitlab {
libiconv = libiconvOrLibc;
ruby = ruby_2_1_3; ruby = ruby_2_1_3;
}; };
@ -6427,10 +6426,7 @@ let
# glibc provides libiconv so systems with glibc don't need to build libiconv # glibc provides libiconv so systems with glibc don't need to build libiconv
# separately, but we also provide libiconvReal, which will always be a # separately, but we also provide libiconvReal, which will always be a
# standalone libiconv, just in case you want it # standalone libiconv, just in case you want it
libiconv = libiconv = if stdenv.isGlibc then stdenv.cc.libc else libiconvReal;
if stdenv.isGlibc
then stdenv.cc.libc
else callPackage ../development/libraries/libiconv { };
libiconvReal = callPackage ../development/libraries/libiconv { }; libiconvReal = callPackage ../development/libraries/libiconv { };