diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
| commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
| tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/development/libraries/qt-5/modules | |
| parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
| parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) | |
| download | nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.gz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.bz2 nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.lz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.xz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.zst nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtbase.nix | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8506a80ddf3f..458946b803d2 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -229,8 +229,6 @@ stdenv.mkDerivation { "-widgets" "-opengl desktop" "-icu" - "-L" "${icu.out}/lib" - "-I" "${icu.dev}/include" "-pch" ] ++ lib.optionals (compareVersion "5.11.0" < 0) @@ -267,18 +265,10 @@ stdenv.mkDerivation { ++ [ "-system-zlib" - "-L" "${zlib.out}/lib" - "-I" "${zlib.dev}/include" "-system-libjpeg" - "-L" "${libjpeg.out}/lib" - "-I" "${libjpeg.dev}/include" "-system-harfbuzz" - "-L" "${harfbuzz.out}/lib" - "-I" "${harfbuzz.dev}/include" "-system-pcre" "-openssl-linked" - "-L" "${openssl.out}/lib" - "-I" "${openssl.dev}/include" "-system-sqlite" ''-${if mysql != null then "plugin" else "no"}-sql-mysql'' ''-${if postgresql != null then "plugin" else "no"}-sql-psql'' @@ -307,14 +297,10 @@ stdenv.mkDerivation { "-system-xcb" "-xcb" "-qpa xcb" - "-L" "${libX11.out}/lib" - "-I" "${libX11.out}/include" - "-L" "${libXext.out}/lib" - "-I" "${libXext.out}/include" - "-L" "${libXrender.out}/lib" - "-I" "${libXrender.out}/include" + "-system-xkbcommon" "-libinput" + "-xkbcommon-evdev" "-no-eglfs" "-no-gbm" @@ -335,19 +321,6 @@ stdenv.mkDerivation { "-no-feature-renameat2" "-no-feature-getentropy" ] - ++ lib.optionals (compareVersion "5.12.1" < 0) [ - # use -xkbcommon and -xkbcommon-evdev for versions before 5.12.1 - "-system-xkbcommon" - "-xkbcommon-evdev" - ] - ++ lib.optionals (cups != null) [ - "-L" "${cups.lib}/lib" - "-I" "${cups.dev}/include" - ] - ++ lib.optionals (mysql != null) [ - "-L" "${mysql.out}/lib" - "-I" "${mysql.out}/include" - ] ); enableParallelBuilding = true; |