diff options
| author | Will Cohen <willcohen@users.noreply.github.com> | 2021-12-14 11:42:56 -0500 |
|---|---|---|
| committer | Will Cohen <willcohen@users.noreply.github.com> | 2022-01-05 19:01:57 -0500 |
| commit | f7a0145a933f3e5f55c2c43157f56729083bfa95 (patch) | |
| tree | 5445fe71cd53fd0faa593a6a5c62a6755906831a | |
| parent | 0c09895790ebbebf73b637f531a71273112960a2 (diff) | |
| download | nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.tar nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.tar.gz nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.tar.bz2 nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.tar.lz nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.tar.xz nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.tar.zst nixpkgs-f7a0145a933f3e5f55c2c43157f56729083bfa95.zip | |
qscintilla: update to use Qt5 only
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index fc2ef6c09a6..bebe637be9b 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,33 +1,30 @@ { stdenv, lib, fetchurl, unzip -, qt4 ? null, qmake4Hook ? null -, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null +, withQt5 ? true, qtbase, qtmacextras ? null +, qmake , fixDarwinDylibNames }: let - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; - version = "2.11.6"; + pname = "qscintilla-qt5"; + version = "2.13.1"; in stdenv.mkDerivation rec { inherit pname version; 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.optional 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 +33,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; { |