diff options
author | Robin Gloster <mail@glob.in> | 2016-04-18 13:00:40 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-04-18 13:49:22 +0000 |
commit | d020caa5b2eca90ea051403fbb4c52b99ee071b9 (patch) | |
tree | ba44ef1e784bca89e0df6b249956fd035b1d86e3 /pkgs/tools/graphics/graphviz/default.nix | |
parent | 3e68106afd95df012ddb548575f0133681687a90 (diff) | |
parent | 0729f606973870c03d21bb2f21b70d91216943ca (diff) | |
download | nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.gz nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.bz2 nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.lz nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.xz nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.tar.zst nixpkgs-d020caa5b2eca90ea051403fbb4c52b99ee071b9.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/graphics/graphviz/default.nix')
-rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 82f958321bd..9b49cca8d7b 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw +{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex }: @@ -23,22 +23,15 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] + [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango + ] ++ stdenv.lib.optionals (xorg != null) + (with xorg; [ xlibsWrapper libXrender libXaw libXpm ]) ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; - configureFlags = - [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" - "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" - "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" - ] - ++ stdenv.lib.optional (xorg == null) "--without-x"; + configureFlags = stdenv.lib.optional (xorg == null) "--without-x"; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' for foo in cmd/dot/Makefile.in cmd/edgepaint/Makefile.in \ |