From dc7f25926ecb7ad64ac5539b10137b552329f1b5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 1 Apr 2022 12:03:11 -0500 Subject: [PATCH] qtModule: allow shared patches Allow modules to include version-independent patches in addition to version-dependent packages. Prior to this change, modules could only provide version-independent patches _instead of_ version-dependent patches. --- pkgs/development/libraries/qt-5/qtModule.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 3323e3fb4cc8..b74d5e086802 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -14,7 +14,7 @@ in mkDerivation (args // { inherit pname version src; - patches = args.patches or patches.${pname} or []; + patches = (args.patches or []) ++ (patches.${pname} or []); nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);