From 4bf49d94179ad2378f50ba54138343fecb75e446 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 9 Sep 2019 19:40:15 +0200 Subject: [PATCH] qscintilla: Use both .so and _qt5.so suffix Make sure that the both libqscintilla2_qt5.so and libqscintilla2.so are present in `$out/lib` so all the dependant packages can find the most appropriate library (some except the empty suffix, such as sqlitebrowser, other expect the _qt5 suffix such as python3Packages.qscintilla-qt5). The mechanism would also work work for qt4 build, but it is broken at the moment. Also make sure python*Packages.qscintilla* are up to date --- pkgs/development/libraries/qscintilla/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index c75f324bf26e..33e57a682b97 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -34,15 +34,16 @@ in stdenv.mkDerivation rec { patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; + # Make sure that libqscintilla2.so is available in $out/lib since it is expected + # by some packages such as sqlitebrowser + postFixup = '' + ln -s $out/lib/libqscintilla2_qt?.so $out/lib/libqscintilla2.so + ''; + enableParallelBuilding = true; - # By default qscintilla will name the library with a qt version suffix which - # confuses the crap out of sqlitebrowser and possibly others so we simply - # strip the suffix as we don't need it and the various FindQScintilla.cmake - # files floating around *should* look for the un-suffixed version. postPatch = '' substituteInPlace qscintilla.pro \ - --replace '_qt$''${QT_MAJOR_VERSION}' "" \ --replace '$$[QT_INSTALL_LIBS]' $out/lib \ --replace '$$[QT_INSTALL_HEADERS]' $out/include \ --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \