public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt55.qtbase: don't include optional dependencies unconditionally

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-19 12:18:06 -06:00
parent 9f62af0885
commit 0a54898a20
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
View File

@ -47,8 +47,6 @@ stdenv.mkDerivation {
++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
inherit decryptSslTraffic gtkStyle mesaSupported;
postPatch = '' postPatch = ''
substituteInPlace configure --replace /bin/pwd pwd substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace qtbase/configure --replace /bin/pwd pwd substituteInPlace qtbase/configure --replace /bin/pwd pwd
@ -77,22 +75,20 @@ stdenv.mkDerivation {
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace "@libX11@" "${libX11}" --replace "@libX11@" "${libX11}"
''
if [[ -n "$gtkStyle" ]]; then + lib.optionalString gtkStyle ''
substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}" substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}"
substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
--replace "@gtk@" "${gtk}" \ --replace "@gtk@" "${gtk}" \
--replace "@gnome_vfs@" "${gnome_vfs}" \ --replace "@gnome_vfs@" "${gnome_vfs}" \
--replace "@libgnomeui@" "${libgnomeui}" \ --replace "@libgnomeui@" "${libgnomeui}" \
--replace "@gconf@" "${GConf}" --replace "@gconf@" "${GConf}"
fi ''
+ lib.optionalString mesaSupported ''
if [[ -n "$mesaSupported" ]]; then substituteInPlace \
substituteInPlace \ qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ --replace "@mesa@" "${mesa}"
--replace "@mesa@" "${mesa}" substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}"
substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}"
fi
''; '';
preConfigure = '' preConfigure = ''