From 2fd522fb62366dd5ca1aa5072a765041c1f2edf4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 21 Apr 2023 13:54:33 +0300 Subject: [PATCH] treewide: fix darwin-specific callPackage combinations --- pkgs/top-level/all-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9cae64ed9a9..ca4aec2a569b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11526,16 +11526,16 @@ with pkgs; qovery-cli = callPackage ../tools/admin/qovery-cli { }; - qownnotes = darwin.apple_sdk_11_0.callPackage ../applications/office/qownnotes { - inherit (libsForQt5) qmake qtbase qtdeclarative qtsvg qttools qtwayland qtwebsockets qtx11extras qtxmlpatterns wrapQtAppsHook; + qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; qpdf = callPackage ../development/libraries/qpdf { }; qprint = callPackage ../tools/text/qprint { }; - qscintilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/qscintilla { - inherit (libsForQt5) qmake qtbase qtmacextras; + qscintilla = libsForQt5.callPackage ../development/libraries/qscintilla { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; qscintilla-qt4 = callPackage ../development/libraries/qscintilla-qt4 { }; @@ -33283,8 +33283,8 @@ with pkgs; quantomatic = callPackage ../applications/science/physics/quantomatic { }; - quassel = darwin.apple_sdk_11_0.callPackage ../applications/networking/irc/quassel { - inherit (libsForQt5) kconfigwidgets kcoreaddons knotifications knotifyconfig ktextwidgets kwidgetsaddons kxmlgui phonon qtbase qtscript mkDerivation qca-qt5; + quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; quasselClient = quassel.override {