diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2022-01-06 23:51:55 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 23:51:55 +0700 |
| commit | 88d7e0ff334177f5a5494ed2616dae195adf6136 (patch) | |
| tree | ac2433284ff1940d8f608fe8c602e4957083b6ea /pkgs/development/libraries/qscintilla/default.nix | |
| parent | 28880f4fe7d50e9640289d24666ea9cfd5d57382 (diff) | |
| parent | a98370af81bd86f2ef3d2177536bb905b10af450 (diff) | |
| download | nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.tar nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.tar.gz nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.tar.bz2 nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.tar.lz nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.tar.xz nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.tar.zst nixpkgs-88d7e0ff334177f5a5494ed2616dae195adf6136.zip | |
Merge pull request #150595 from willcohen/qscintilla
qscintilla: fix build on darwin
Diffstat (limited to 'pkgs/development/libraries/qscintilla/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index fc2ef6c09a6..3dcbc22e15f 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,33 +1,27 @@ { stdenv, lib, fetchurl, unzip -, qt4 ? null, qmake4Hook ? null -, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null +, qtbase, qtmacextras +, qmake , fixDarwinDylibNames }: -let - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; - version = "2.11.6"; - -in stdenv.mkDerivation rec { - inherit pname version; +stdenv.mkDerivation rec { + pname = "qscintilla-qt5"; + version = "2.13.1"; src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; - sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; + url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"; + sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo="; }; - sourceRoot = "QScintilla-${version}/Qt4Qt5"; + sourceRoot = "QScintilla_src-${version}/src"; - buildInputs = [ (if withQt5 then qtbase else qt4) ]; + buildInputs = [ qtbase ]; - propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ qtmacextras ]; - nativeBuildInputs = [ unzip ] - ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) + nativeBuildInputs = [ unzip qmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = lib.optional (!withQt5) ./fix-qt4-build.patch; - # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser postFixup = '' @@ -36,14 +30,13 @@ in stdenv.mkDerivation rec { dontWrapQtApps = true; - postPatch = '' + preConfigure = '' substituteInPlace qscintilla.pro \ --replace '$$[QT_INSTALL_LIBS]' $out/lib \ --replace '$$[QT_INSTALL_HEADERS]' $out/include \ --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \ --replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]' $out/share${lib.optionalString (! withQt5) "/qt"} + --replace '$$[QT_INSTALL_DATA]' $out/share ''; meta = with lib; { |