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

kill libiconvOr*

Browse Source 
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
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/science/astronomy/stellarium/default.nix
+2 -3
View File
@@ -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;