From e8c99eb1b96e7c00ab4c3b559eddf9dcafabd61d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 5 Jun 2026 02:34:30 +0300 Subject: [PATCH 1/2] qt6Packages.qca: avoid redundent inherit from qt6 --- pkgs/top-level/qt6-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 85e7bc2b9d16..dbcc8f34e8e4 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -94,9 +94,7 @@ makeScopeWithSplicing' { pyotherside = callPackage ../development/libraries/pyotherside { }; - qca = callPackage ../development/libraries/qca { - inherit (qt6) qtbase qt5compat; - }; + qca = callPackage ../development/libraries/qca { }; qcoro = callPackage ../development/libraries/qcoro { }; qcustomplot = callPackage ../development/libraries/qcustomplot { }; qgpgme = callPackage ../development/libraries/qgpgme { }; From 433ac56be1bdc5883ad91efac2fa0beb6ab293ad Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 5 Jun 2026 04:35:46 +0300 Subject: [PATCH 2/2] libsForQt5.qca: remove redundent qt5 inheritence --- pkgs/top-level/qt5-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index b6af4b4bcc4e..317806f77aa2 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -124,9 +124,7 @@ makeScopeWithSplicing' { pyotherside = callPackage ../development/libraries/pyotherside { }; - qca = callPackage ../development/libraries/qca { - inherit (libsForQt5) qtbase; - }; + qca = callPackage ../development/libraries/qca { }; qca-qt5 = self.qca; qcoro = callPackage ../development/libraries/qcoro { };