From abb3479fcb70e768e6eaf13ba73ab0a5eeb3d5fc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 24 Oct 2017 06:45:23 -0500 Subject: qscintilla: fix qmake install paths --- pkgs/development/libraries/qscintilla/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index c2e6c3cb3b5..f5c5a667418 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -21,11 +21,23 @@ stdenv.mkDerivation rec { preConfigure = '' cd Qt4Qt5 + ${if withQt5 + then '' + sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ + -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \ + -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/translations," \ + -e "s,\$\$\\[QT_HOST_DATA\\]/mkspecs,$out/mkspecs," \ + -e "s,\$\$\\[QT_INSTALL_DATA\\]/mkspecs,$out/mkspecs," \ + -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share," \ + qscintilla.pro + '' + else '' sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ -e "s,\$\$\\[QT_INSTALL_HEADERS\\],$out/include/," \ -e "s,\$\$\\[QT_INSTALL_TRANSLATIONS\\],$out/share/qt/translations," \ -e "s,\$\$\\[QT_INSTALL_DATA\\],$out/share/qt," \ qscintilla.pro + ''} ''; meta = with stdenv.lib; { -- cgit 1.4.1