summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-3
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-09-15 11:13:22 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-09-15 12:08:24 +0200
commit21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch)
treea23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/development/libraries/qt-3
parent47ad941fbfe752f679d6bc577d2408f79aee7054 (diff)
downloadnixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar
nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz
nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2
nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz
nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz
nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst
nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.zip
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
Diffstat (limited to 'pkgs/development/libraries/qt-3')
-rw-r--r--pkgs/development/libraries/qt-3/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index ffad4418815..08d8f141deb 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -7,7 +7,7 @@
 , threadSupport ? true
 , mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
-, x11, xextproto, zlib, libjpeg, libpng, which
+, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which
 }:
 
 assert xftSupport -> libXft != null;
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ which ];
-  propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg];
+  propagatedBuildInputs = [libpng xlibsWrapper libXft libXrender zlib libjpeg];
 
   configureFlags = "
     -v