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

qt55.qtbase: fix syntax error

This commit is contained in:
Thomas Tuegel 2016-01-23 07:52:29 -06:00
parent 2b76df28b0
commit 21bebe1592
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,8 +53,6 @@ stdenv.mkDerivation {
substituteInPlace qtbase/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/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
libgnomeui = libgnomeui.out;
gnome_vfs = gnome_vfs.out;
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
@ -83,8 +81,8 @@ stdenv.mkDerivation {
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.out}" \
--replace "@libgnomeui@" "${libgnomeui}" \ --replace "@libgnomeui@" "${libgnomeui.out}" \
--replace "@gconf@" "${GConf}" --replace "@gconf@" "${GConf}"
'' ''
+ lib.optionalString mesaSupported '' + lib.optionalString mesaSupported ''
@ -188,7 +186,7 @@ stdenv.mkDerivation {
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib ++ lib.optional (mysql != null) mysql.lib
++ lib.optional (postgresql != null) postgresql ++ lib.optional (postgresql != null) postgresql
++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
buildInputs = buildInputs =
[ bison flex gperf ruby ] [ bison flex gperf ruby ]