diff options
author | Will Cohen <willcohen@users.noreply.github.com> | 2021-12-15 11:22:46 -0500 |
---|---|---|
committer | Will Cohen <willcohen@users.noreply.github.com> | 2022-01-05 19:02:01 -0500 |
commit | 24522dcd0fa808ef34b486363a578d1af3118ead (patch) | |
tree | 54e8db0f2f15fc1bc5cf29afe9dd343f7e80f8b1 /pkgs/top-level/qt5-packages.nix | |
parent | 9d8903bab640891b1655023eef3da939618cea32 (diff) |
qscintilla: migrate to libsForQt5.qscintilla
Diffstat (limited to 'pkgs/top-level/qt5-packages.nix')
-rw-r--r-- | pkgs/top-level/qt5-packages.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index a2bd8dc6a547f..5579461a712b0 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -9,6 +9,7 @@ { lib , pkgs , qt5 +, stdenv }: (lib.makeScope pkgs.newScope ( self: @@ -190,8 +191,12 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qoauth = callPackage ../development/libraries/qoauth { }; - qscintilla = callPackage ../development/libraries/qscintilla { - withQt5 = true; + qscintilla = if stdenv.isDarwin then + callPackage ../development/libraries/qscintilla { + inherit (qt5) qmake qtbase qtmacextras; + } else + callPackage ../development/libraries/qscintilla { + inherit (qt5) qmake qtbase; }; qt5ct = callPackage ../tools/misc/qt5ct { }; |