From 7a7a18064ae40a75bb09e317d93b5bac83ae12ba Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 14 Dec 2021 11:46:09 -0500 Subject: [PATCH] qscintilla: default to Qt5 --- pkgs/top-level/all-packages.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cfe37021e46..48e1881a6c68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9092,7 +9092,15 @@ with pkgs; qprint = callPackage ../tools/text/qprint { }; - qscintilla = callPackage ../development/libraries/qscintilla { }; + qscintilla = if stdenv.isDarwin then + callPackage ../development/libraries/qscintilla { + inherit (qt5) qmake qtbase qtmacextras; + } else + callPackage ../development/libraries/qscintilla { + inherit (qt5) qmake qtbase; + }; + + qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; qshowdiff = callPackage ../tools/text/qshowdiff { };