diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:31:55 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:40:23 +0300 |
| commit | aef35c52f0ddc99d326239b51ca1a2ea03450316 (patch) | |
| tree | 38693952c3e8055ec79d601ae123a3500b1937a8 /pkgs | |
| parent | c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744 (diff) | |
| download | nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.tar nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.tar.gz nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.tar.bz2 nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.tar.lz nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.tar.xz nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.tar.zst nixlib-aef35c52f0ddc99d326239b51ca1a2ea03450316.zip | |
treewide: Fix output references to libX11
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/taskjuggler/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/tkgate/1.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/agg/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/imlib/default.nix | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index e1e047714603..2a199843cb3b 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { configureFlags = " --without-arts --disable-docs - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib + --x-includes=${libX11.dev}/include + --x-libraries=${libX11.out}/lib --with-qt-dir=${qt3} "; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 61d03173e0ba..2a3f17b670b4 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i config.h \ -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \ - -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \ - -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \ + -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11.dev}/include"|' \ + -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11.out}/lib"|' \ \ -e '20 i #define TCL_LIBRARY "${tcl}/lib"' \ -e '20 i #define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"' \ diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 549310931f9e..8b8d3a29193f 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sh autogen.sh ''; - configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib"; + configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib"; meta = { description = "High quality rendering engine for C++"; diff --git a/pkgs/development/libraries/imlib/default.nix b/pkgs/development/libraries/imlib/default.nix index e99fc2ca3f96..624e401b62f7 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation { configureFlags = " --disable-shm - --x-includes=${libX11}/include - --x-libraries=${libX11}/lib"; + --x-includes=${libX11.dev}/include + --x-libraries=${libX11.out}/lib"; buildInputs = [libjpeg libXext libX11 xextproto libtiff libungif libpng]; |