diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-23 07:52:29 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-01-23 07:52:29 -0600 |
| commit | 21bebe15920dbcab0c9a068a05ec137e82f5740e (patch) | |
| tree | 7050de8a80051fff20c8ed641394892c0f5d696a /pkgs | |
| parent | 2b76df28b066edd52f874b95ec22628851ad6ee2 (diff) | |
| download | nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.tar nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.tar.gz nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.tar.bz2 nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.tar.lz nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.tar.xz nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.tar.zst nixpkgs-21bebe15920dbcab0c9a068a05ec137e82f5740e.zip | |
qt55.qtbase: fix syntax error
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 8 |
1 files changed, 3 insertions, 5 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 8f771f1f621..a4e9e57ca9e 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -53,8 +53,6 @@ stdenv.mkDerivation { substituteInPlace qtbase/configure --replace /bin/pwd pwd 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 - 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/Qt5CoreMacros.cmake" @@ -83,8 +81,8 @@ stdenv.mkDerivation { 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 "@gnome_vfs@" "${gnome_vfs.out}" \ + --replace "@libgnomeui@" "${libgnomeui.out}" \ --replace "@gconf@" "${GConf}" '' + lib.optionalString mesaSupported '' @@ -188,7 +186,7 @@ stdenv.mkDerivation { ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql - ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf]; + ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; buildInputs = [ bison flex gperf ruby ] |