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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-04-18 13:49:22 +00:00
parent 3e68106afd 0729f60697
commit d020caa5b2
1369 changed files with 35810 additions and 10571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/graphviz/2.0.nix
+3 -3
View File
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng}/lib"
"--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg}/lib"
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
"--with-expatlibdir=${expat.out}/lib"
]
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
pkgs/tools/graphics/graphviz/2.32.nix
+4 -4
View File
@@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng}/lib"
"--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg}/lib"
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
"--with-expatlibdir=${expat.out}/lib"
"--with-cgraph=no"
"--with-sparse=no"
]
pkgs/tools/graphics/graphviz/default.nix
+6 -13
View File
@@ -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 \