diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 12:43:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 12:43:20 +0100 |
| commit | 3941c15b599db36528ac3f0ff98bbbd7ab39114a (patch) | |
| tree | 2e2a982afbce64e0726e50f6b2c908233aa52b9c /pkgs | |
| parent | 9f7510113e7ad92128c1a7464f092787a08c1c82 (diff) | |
| download | nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.tar nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.tar.gz nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.tar.bz2 nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.tar.lz nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.tar.xz nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.tar.zst nixlib-3941c15b599db36528ac3f0ff98bbbd7ab39114a.zip | |
gnuplot: pass aquaterm request explicitely (see #1197)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index beb32ed9bea3..dc1a476b6e7d 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -16,7 +16,9 @@ , coreutils ? null }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); - +let + withX = libX11 != null && !aquaterm; +in stdenv.mkDerivation rec { name = "gnuplot-4.6.3"; @@ -25,8 +27,6 @@ stdenv.mkDerivation rec { sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz"; }; - withX = libX11 != null && !aquaterm; - buildInputs = [ zlib gd texinfo readline emacs lua texLive pango cairo pkgconfig makeWrapper ] @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { # compiling with wxGTK causes a malloc (double free) error on darwin ++ 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 '' wrapProgram $out/bin/gnuplot \ |