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

gnuplot: pass aquaterm request explicitely (see #1197)

This commit is contained in:
Vladimír Čunát 2013-12-10 12:43:20 +01:00
parent 9f7510113e
commit 3941c15b59
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,9 @@
, coreutils ? null }: , coreutils ? null }:
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let
withX = libX11 != null && !aquaterm;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnuplot-4.6.3"; name = "gnuplot-4.6.3";
@ -25,8 +27,6 @@ stdenv.mkDerivation rec {
sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz";
}; };
withX = libX11 != null && !aquaterm;
buildInputs = buildInputs =
[ zlib gd texinfo readline emacs lua texLive [ zlib gd texinfo readline emacs lua texLive
pango cairo pkgconfig makeWrapper ] pango cairo pkgconfig makeWrapper ]
@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
# compiling with wxGTK causes a malloc (double free) error on darwin # compiling with wxGTK causes a malloc (double free) error on darwin
++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK; ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
configureFlags = if withX then ["--with-x"] else ["--without-x"]; configureFlags =
(if withX then ["--with-x"] else ["--without-x"])
++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"])
;
postInstall = stdenv.lib.optionalString withX '' postInstall = stdenv.lib.optionalString withX ''
wrapProgram $out/bin/gnuplot \ wrapProgram $out/bin/gnuplot \