gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #227428 from wegank/darwin-qt5-comb

Browse Source 
treewide: fix darwin-specific callPackage combinations
This commit is contained in:
Weijia Wang
2023-04-21 15:13:00 +03:00
committed by GitHub
parent 789bb04f46 2fd522fb62
commit 389335eacb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -6
View File
@@ -11525,16 +11525,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 { };
@@ -33286,8 +33286,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 {