From e08b9ab8d3d6362c774a786797347fa7483af773 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Wed, 26 Nov 2014 15:16:50 -0800 Subject: 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 --- pkgs/applications/science/astronomy/stellarium/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/science') 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; -- cgit 1.4.1