diff options
| author | Peter Simons <simons@cryp.to> | 2013-02-18 11:54:56 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-02-18 11:54:56 +0100 |
| commit | 9e68734d61567c9118cdd241260c2c5cb1e1cebe (patch) | |
| tree | efb908fbed22ac8d6ba6cce690e54936e1be834c /pkgs/tools/graphics | |
| parent | e259e52a7dab1cd71ddc47496cf612ac102123c3 (diff) | |
| parent | b076ab94d63bf903710dbd126692f5e889c27a0c (diff) | |
| download | nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.tar nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.tar.gz nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.tar.bz2 nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.tar.lz nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.tar.xz nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.tar.zst nixlib-9e68734d61567c9118cdd241260c2c5cb1e1cebe.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh | 4 |
2 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index ce564e8de4fe..5ef6db7ae47a 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, gd, texinfo +{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper , texLive ? null , lua ? null , emacs ? null @@ -11,25 +11,36 @@ , cairo ? null , pkgconfig ? null , readline +, fontconfig ? null, gnused ? null, coreutils ? null }: +assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); + stdenv.mkDerivation rec { name = "gnuplot-4.4.4"; - + src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; sha256 = "1zfv3npsxfn743wl65ibh11djxrc8fxzi2mgg75ppy6m12fmja6j"; }; - configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; - buildInputs = [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw - wxGTK pango cairo pkgconfig + wxGTK pango cairo pkgconfig makeWrapper ]; + configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"]; + + postInstall = stdenv.lib.optionalString (libX11 != null) '' + wrapProgram $out/bin/gnuplot \ + --prefix PATH : '${gnused}/bin' \ + --prefix PATH : '${coreutils}/bin' \ + --prefix PATH : '${fontconfig}/bin' \ + --run '. ${./set-gdfontpath-from-fontconfig.sh}' + ''; + meta = { - homepage = http://www.gnuplot.info; + homepage = "http://www.gnuplot.info"; description = "A portable command-line driven graphing utility for many platforms"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh new file mode 100644 index 000000000000..4886b4f2b7c0 --- /dev/null +++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh @@ -0,0 +1,4 @@ +p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) ) +IFS=: +export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}" +unset IFS p |