diff options
author | Will Cohen <willcohen@users.noreply.github.com> | 2021-12-15 11:07:15 -0500 |
---|---|---|
committer | Will Cohen <willcohen@users.noreply.github.com> | 2022-01-05 19:02:01 -0500 |
commit | 9d8903bab640891b1655023eef3da939618cea32 (patch) | |
tree | b796855817dd5a083323aee363f826c53c6b3a87 /pkgs/development/libraries | |
parent | 2cdbb565adbed90914eb2ea417b834837af10378 (diff) |
qscintilla-qt4: Remove qt5/darwin support
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/qscintilla-qt4/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/development/libraries/qscintilla-qt4/default.nix b/pkgs/development/libraries/qscintilla-qt4/default.nix index fc2ef6c09a632..c74a9b9d1900a 100644 --- a/pkgs/development/libraries/qscintilla-qt4/default.nix +++ b/pkgs/development/libraries/qscintilla-qt4/default.nix @@ -1,11 +1,8 @@ -{ stdenv, lib, fetchurl, unzip -, qt4 ? null, qmake4Hook ? null -, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null -, fixDarwinDylibNames +{ stdenv, lib, fetchurl, unzip, qt4, qmake4Hook }: let - pname = "qscintilla-qt${if withQt5 then "5" else "4"}"; + pname = "qscintilla-qt4"; version = "2.11.6"; in stdenv.mkDerivation rec { @@ -18,15 +15,11 @@ in stdenv.mkDerivation rec { sourceRoot = "QScintilla-${version}/Qt4Qt5"; - buildInputs = [ (if withQt5 then qtbase else qt4) ]; + buildInputs = [ qt4 ]; - propagatedBuildInputs = lib.optional (withQt5 && stdenv.isDarwin) qtmacextras; + nativeBuildInputs = [ unzip qmake4Hook ]; - nativeBuildInputs = [ unzip ] - ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - - patches = lib.optional (!withQt5) ./fix-qt4-build.patch; + patches = ./fix-qt4-build.patch; # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -43,7 +36,7 @@ in stdenv.mkDerivation rec { --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; { @@ -65,6 +58,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; license = with licenses; [ gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } |