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-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/graphviz/2.0.nix
+8 -5
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd
, yacc, libtool, fontconfig, pango, gd, libwebp
}:
assert libpng != null && libjpeg != null && expat != null;
@@ -12,16 +12,19 @@ stdenv.mkDerivation rec {
sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
};
buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
buildInputs = [
pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc
libtool fontconfig pango gd libwebp
];
hardeningDisable = [ "format" "fortify" ];
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
[ "--with-pngincludedir=${libpng.dev}/include"
"--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib"
]
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
pkgs/tools/graphics/graphviz/2.32.nix
+3 -3
View File
@@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
[ "--with-pngincludedir=${libpng.dev}/include"
"--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib"
"--with-cgraph=no"
"--with-sparse=no"