From 3dac2b2745049820a4f48d83e00b9bbca6db1069 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 25 Jul 2023 17:49:12 +0200 Subject: [PATCH] qscintilla-qt6: init (cherry picked from commit 717d80c63e50100ee80428fa941e35b92650baad) Signed-off-by: Matthias Beyer Co-authored-by: Francesco Gazzetta --- pkgs/development/libraries/qscintilla/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 4aff530877a..5a2b00c54e3 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -3,7 +3,7 @@ , fetchurl , unzip , qtbase -, qtmacextras +, qtmacextras ? null , qmake , fixDarwinDylibNames }: @@ -63,5 +63,7 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + # ld: library not found for -lcups + broken = stdenv.isDarwin && lib.versionAtLeast qtbase.version "6"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a2e7ac138..e5f2919d3f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12303,6 +12303,8 @@ with pkgs; qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; + qscintilla-qt6 = qt6Packages.callPackage ../development/libraries/qscintilla { }; + qrcp = callPackage ../tools/networking/qrcp { }; qrscan = callPackage ../tools/misc/qrscan { };