diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
commit | 333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb (patch) | |
tree | 0f4757ddd2bb3d73b438eea85828d8e01c049583 /pkgs/tools/graphics/graphviz/default.nix | |
parent | bdbbfa0d4247e203ffe3171621b614374da05f70 (diff) | |
parent | b809f886c0bdbd4665fc65a4c308d38a30c368d8 (diff) | |
download | nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.gz nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.bz2 nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.lz nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.xz nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.zst nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.zip |
Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
Diffstat (limited to 'pkgs/tools/graphics/graphviz/default.nix')
-rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 0e83899f0b7..78784580eac 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -31,6 +31,13 @@ stdenv.mkDerivation rec { 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 \ + cmd/mingle/Makefile.in plugin/gdiplus/Makefile.in; do + substituteInPlace "$foo" --replace "-lstdc++" "-lc++" + done + ''; + preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile ''; |