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

gnuplot: Use default compiler on Darwin

Browse Source
This commit is contained in:
Eelco Dolstra 2014-08-09 19:52:33 +02:00
parent 8ede29197f
commit 9f08904c8d
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/graphics/gnuplot/default.nix
View File

@ -18,7 +18,7 @@
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let let
withX = libX11 != null && !aquaterm; withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnuplot-4.6.5"; name = "gnuplot-4.6.5";
@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ zlib gd texinfo4 readline [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ]
pango cairo pkgconfig makeWrapper ]
++ lib.optional withTeXLive texLive ++ lib.optional withTeXLive texLive
++ lib.optional withLua lua ++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]

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

@ -1152,12 +1152,7 @@ let
libassuan = libassuan2_1; libassuan = libassuan2_1;
}); });
gnuplot = callPackage ../tools/graphics/gnuplot { gnuplot = callPackage ../tools/graphics/gnuplot { };
# use gccApple to compile on darwin, seems to resolve a malloc error
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
};
gnuplot_qt = gnuplot.override { withQt = true; }; gnuplot_qt = gnuplot.override { withQt = true; };