diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/applications/science | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
| download | nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixpkgs-e08b9ab8d3d6362c774a786797347fa7483af773.zip | |
kill libiconvOr*
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/astronomy/stellarium/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index ebe756a47f3..d73ebe87b11 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5, perl -, libiconvOrEmpty }: +, libiconv }: stdenv.mkDerivation rec { name = "stellarium-0.13.2"; @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1asrq1v6vjzxd2zz92brdfs5f5b1qf8zwd7k2dpg3dl4shl8wwg5"; }; - buildInputs = [ cmake freetype libpng mesa gettext openssl qt5 perl ] - ++ libiconvOrEmpty; + buildInputs = [ cmake freetype libpng mesa gettext openssl qt5 perl libiconv ]; enableParallelBuilding = true; |