mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

qt5: remove references to /usr/{share,lib}/X11/locale/

Browse source 
Qt5 currently hardcodes /usr/{share,lib}/X11/locale/. Fix it to use
paths from the nix store. Qt4 is unaffected.

This fixes a startup warning for applications built with qt5 (e.g.
qtcreator, shotcut):

  Qt Warning: Could not find a location of the system's Compose files. Consider setting the QTCOMPOSE environment variable.
This commit is contained in:
Bjørn Forsman 2014-07-31 19:52:22 +02:00 committed by Rok Garbas
parent 74ce1a016f
commit 61121203c2
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/qt-5/default.nix
View file

@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace qtbase/configure --replace /bin/pwd pwd
substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace /usr/share/X11/locale ${libX11}/share/X11/locale \
--replace /usr/lib/X11/locale ${libX11}/share/X11/locale
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
'';

3
pkgs/development/libraries/qt-5/qt-5.3.nix
View file

@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace qtbase/configure --replace /bin/pwd pwd
substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace /usr/share/X11/locale ${libX11}/share/X11/locale \
--replace /usr/lib/X11/locale ${libX11}/share/X11/locale
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
'';