From a1cbe4236b0e3db2245a459172c7bd21b719a4c2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 21 Feb 2025 10:10:46 -0600 Subject: [PATCH 1/2] qscintilla: fix library linking on darwin --- pkgs/development/libraries/qscintilla/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 91d349d3eb31..d847fb53c3bf 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -32,9 +32,13 @@ stdenv.mkDerivation rec { # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser - postFixup = '' - ln -s $out/lib/libqscintilla2_qt5.so $out/lib/libqscintilla2.so - ''; + postFixup = + let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + ln -s $out/lib/libqscintilla2_qt5${libExt} $out/lib/libqscintilla2${libExt} + ''; dontWrapQtApps = true; From ee804fbdb27a98456c4c005971c62c1bead24050 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 21 Feb 2025 10:28:22 -0600 Subject: [PATCH 2/2] qscintilla: remove unused input --- pkgs/development/libraries/qscintilla/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index d847fb53c3bf..5456aa0811e2 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -7,7 +7,6 @@ qtmacextras ? null, qmake, fixDarwinDylibNames, - darwin, }: stdenv.mkDerivation rec {