diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:55:12 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-03 12:58:54 +0100 |
commit | ed867a50eb89a90db3b1741bf4c0bf0cd4557dba (patch) | |
tree | a95502fbc6cb68e944d1aa5202d024c97365b09c /pkgs/applications/science | |
parent | 5b00625aa434205774d3e1cd43852ca1cbffc046 (diff) | |
download | nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.gz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.bz2 nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.lz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.xz nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.tar.zst nixlib-ed867a50eb89a90db3b1741bf4c0bf0cd4557dba.zip |
iconv: remove usage on Linux in several packages
This fixes builds after #4419. Thanks to @vbgl for the original commit; I changed that as I'm not sure whether passing null values to buildInputs is clean. CC maintainers: @coroa, @peti, @phreedom, @robberer, @jcumming.
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/astronomy/stellarium/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 6b84143d0138..d7ae496f5aa6 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }: +{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl +, libiconvOrEmpty }: stdenv.mkDerivation rec { name = "stellarium-0.12.4"; @@ -8,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg"; }; - buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ]; + buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl ] + ++ libiconvOrEmpty; enableParallelBuilding = true; |