diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 04:40:47 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch) | |
| tree | e7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/development/libraries/qt-3 | |
| parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/development/libraries/qt-3')
| -rw-r--r-- | pkgs/development/libraries/qt-3/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 95b82f8f3cff..3f3e9158622a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl , xftSupport ? true, libXft ? null , xrenderSupport ? true, libXrender ? null -, xrandrSupport ? true, libXrandr ? null, randrproto ? null +, xrandrSupport ? true, libXrandr ? null , xineramaSupport ? true, libXinerama ? null , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null , openglSupport ? false, libGLU_combined ? null, libXmu ? null -, xlibsWrapper, xextproto, zlib, libjpeg, libpng, which +, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which }: assert xftSupport -> libXft != null; assert xrenderSupport -> xftSupport && libXrender != null; -assert xrandrSupport -> libXrandr != null && randrproto != null; +assert xrandrSupport -> libXrandr != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> mysql != null; assert openglSupport -> libGLU_combined != null && libXmu != null; @@ -40,7 +40,7 @@ stdenv.mkDerivation { "-v" "-system-zlib" "-system-libpng" "-system-libjpeg" "-qt-gif" - "-I${xextproto}/include" + "-I${xorgproto}/include" (mk threadSupport "thread") (mk xrenderSupport "xrender") (mk xrandrSupport "xrandr") @@ -55,7 +55,6 @@ stdenv.mkDerivation { "-L${libXrender.out}/lib" "-I${libXrender.dev}/include" ] ++ stdenv.lib.optionals xrandrSupport [ "-L${libXrandr.out}/lib" "-I${libXrandr.dev}/include" - "-I${randrproto}/include" ] ++ stdenv.lib.optionals xineramaSupport [ "-L${libXinerama.out}/lib" "-I${libXinerama.dev}/include" ] ++ stdenv.lib.optionals cursorSupport [ |