diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 10:32:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:59:33 +0200 |
| commit | 0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7 (patch) | |
| tree | 775ac2949498971a493bb10c85d92ff4679a67eb /pkgs/tools/graphics/graphviz | |
| parent | 6521957bf4057806ca01efdd92406b41c10a38c2 (diff) | |
| download | nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.gz nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.bz2 nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.lz nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.xz nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.tar.zst nixlib-0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7.zip | |
xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`, especially when using `with xlibs`, such as in wine. Also, now `xlibs` is the same as `xorg`.
Diffstat (limited to 'pkgs/tools/graphics/graphviz')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 801795397014..aecc7bba501a 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig pango gd gts - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 2fcea02519a5..9c3213c878b1 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ] + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibsWrapper xlibs.libXrender pango libXaw ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin") |