Merge pull request #45888 from obsidiansystems/qt3-configure-flags

qt-3: Make `configureFlags` a list
This commit is contained in:
John Ericson 2018-09-01 15:37:30 -04:00 committed by GitHub
commit 31e675068e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -34,27 +34,39 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
configureFlags = " configureFlags = let
-v mk = cond: name: "-${stdenv.lib.optionalString (!cond) "no-"}${name}";
-system-zlib -system-libpng -system-libjpeg in [
-qt-gif "-v"
-I${xextproto}/include "-system-zlib" "-system-libpng" "-system-libjpeg"
${if openglSupport then "-dlopen-opengl "-qt-gif"
-L${libGLU_combined}/lib -I${libGLU_combined}/include "-I${xextproto}/include"
-L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} (mk threadSupport "thread")
${if threadSupport then "-thread" else "-no-thread"} (mk xrenderSupport "xrender")
${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} (mk xrandrSupport "xrandr")
${if xrandrSupport then "-xrandr (mk xineramaSupport "xinerama")
-L${libXrandr.out}/lib -I${libXrandr.dev}/include (mk xrandrSupport "xrandr")
-I${randrproto}/include" else "-no-xrandr"} (mk xftSupport "xft")
${if xineramaSupport then "-xinerama -L${libXinerama.out}/lib -I${libXinerama.dev}/include" else "-no-xinerama"} ] ++ stdenv.lib.optionals openglSupport [
${if cursorSupport then "-L${libXcursor.out}/lib -I${libXcursor.dev}/include" else ""} "-dlopen-opengl"
${if mysqlSupport then "-qt-sql-mysql -L${mysql.connector-c}/lib/mysql -I${mysql.connector-c}/include/mysql" else ""} "-L${libGLU_combined}/lib" "-I${libGLU_combined}/include"
${if xftSupport then "-xft "-L${libXmu.out}/lib" "-I${libXmu.dev}/include"
-L${libXft.out}/lib -I${libXft.dev}/include ] ++ stdenv.lib.optionals xrenderSupport [
-L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include "-L${libXrender.out}/lib" "-I${libXrender.dev}/include"
-L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"} ] ++ 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 [
"-L${libXcursor.out}/lib -I${libXcursor.dev}/include"
] ++ stdenv.lib.optionals mysqlSupport [
"-qt-sql-mysql" "-L${mysql.connector-c}/lib/mysql" "-I${mysql.connector-c}/include/mysql"
] ++ stdenv.lib.optionals xftSupport [
"-L${libXft.out}/lib" "-I${libXft.dev}/include"
"-L${libXft.freetype.out}/lib" "-I${libXft.freetype.dev}/include"
"-L${libXft.fontconfig.lib}/lib" "-I${libXft.fontconfig.dev}/include"
];
patches = [ patches = [
# Don't strip everything so we can get useful backtraces. # Don't strip everything so we can get useful backtraces.