From d01300927cc23b095c5cb9580ab429f72e433de1 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Fri, 11 Jul 2025 10:56:37 +0200 Subject: [PATCH] qscintilla: don't hardcode qt version in package name This package is build for both Qt 5 and Qt 6. --- pkgs/development/libraries/qscintilla/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 3ac9899bc498..83df3a1fcddd 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,6 +1,7 @@ { - stdenv, lib, + stdenv, + fetchurl, unzip, qtbase, @@ -9,8 +10,11 @@ fixDarwinDylibNames, }: +let + qtVersion = lib.versions.major qtbase.version; +in stdenv.mkDerivation (finalAttrs: { - pname = "qscintilla-qt5"; + pname = "qscintilla-qt${qtVersion}"; version = "2.14.1"; src = fetchurl { @@ -34,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: { postFixup = let libExt = stdenv.hostPlatform.extensions.sharedLibrary; - qtVersion = lib.versions.major qtbase.version; in '' ln -s $out/lib/libqscintilla2_qt${qtVersion}${libExt} $out/lib/libqscintilla2${libExt}