diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 12:18:06 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 12:18:06 -0600 |
| commit | 0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a (patch) | |
| tree | cf829027dde7df49528f576d4654cf3ac587e71c | |
| parent | 9f62af08854a446e6e87434895ae0032d19778f4 (diff) | |
| download | nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.tar nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.tar.gz nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.tar.bz2 nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.tar.lz nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.tar.xz nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.tar.zst nixlib-0a54898a20468ddc62d7ff4a3f0f0df2ac40ba3a.zip | |
qt55.qtbase: don't include optional dependencies unconditionally
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 57ae127c9082..589f2a1de1e5 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -47,8 +47,6 @@ stdenv.mkDerivation { ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; - inherit decryptSslTraffic gtkStyle mesaSupported; - postPatch = '' substituteInPlace configure --replace /bin/pwd pwd substituteInPlace qtbase/configure --replace /bin/pwd pwd @@ -77,22 +75,20 @@ stdenv.mkDerivation { substituteInPlace \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ --replace "@libX11@" "${libX11}" - - if [[ -n "$gtkStyle" ]]; then - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" - substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk}" \ - --replace "@gnome_vfs@" "${gnome_vfs}" \ - --replace "@libgnomeui@" "${libgnomeui}" \ - --replace "@gconf@" "${GConf}" - fi - - if [[ -n "$mesaSupported" ]]; then - substituteInPlace \ - qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa@" "${mesa}" - substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" - fi + '' + + lib.optionalString gtkStyle '' + substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" + substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ + --replace "@gtk@" "${gtk}" \ + --replace "@gnome_vfs@" "${gnome_vfs}" \ + --replace "@libgnomeui@" "${libgnomeui}" \ + --replace "@gconf@" "${GConf}" + '' + + lib.optionalString mesaSupported '' + substituteInPlace \ + qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ + --replace "@mesa@" "${mesa}" + substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}" ''; preConfigure = '' |