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

treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin

Browse Source
This commit is contained in:
Weijia Wang
2025-01-03 19:55:15 +01:00
parent 0d2230e8ea
commit 2b969610d6
9 changed files with 16 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ne/nextcloud-client/package.nix
+2 -1
View File
@@ -2,6 +2,7 @@
, gitUpdater
, fetchFromGitHub
, qt6Packages
, stdenv
, cmake
, extra-cmake-modules
, inotify-tools
@@ -18,7 +19,7 @@
, libsysprof-capture
}:
qt6Packages.stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "nextcloud-client";
version = "3.15.2";
pkgs/by-name/op/openimagedenoise/package.nix
+1 -4
View File
@@ -13,10 +13,7 @@
xcodebuild,
}:
let
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
pname = "openimagedenoise";
version = "2.2.2";
pkgs/by-name/qo/qownnotes/package.nix
+1 -1
View File
@@ -17,7 +17,7 @@ let
appname = "QOwnNotes";
version = "24.12.7";
in
qt6Packages.stdenv.mkDerivation {
stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
pkgs/development/libraries/mongocxx/default.nix
+1 -3
View File
@@ -1,5 +1,5 @@
{ lib
, pkgs
, stdenv
, fetchFromGitHub
, mongoc
, openssl
@@ -10,8 +10,6 @@
, darwin
}:
let stdenv = if pkgs.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
stdenv.mkDerivation (finalAttrs: {
pname = "mongocxx";
version = "4.0.0";
pkgs/development/libraries/qscintilla/default.nix
+1 -4
View File
@@ -10,10 +10,7 @@
darwin,
}:
let
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
in
stdenv'.mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qscintilla-qt5";
version = "2.13.2";
pkgs/development/python-modules/openusd/default.nix
+1 -2
View File
@@ -62,8 +62,7 @@ buildPythonPackage rec {
hash = "sha256-slBJleeDi0mCVThty4NUX4M9vaCLV+E8rnp1Ab77TmE=";
};
stdenv =
if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
stdenv = python.stdenv;
outputs = [ "out" ] ++ lib.optional withDocs "doc";
pkgs/development/python-modules/python-mapnik/default.nix
+1 -2
View File
@@ -53,8 +53,7 @@ buildPythonPackage rec {
./python-mapnik_std_optional.patch
];
stdenv =
if python.stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
stdenv = python.stdenv;
build-system = [ setuptools ];
pkgs/top-level/all-packages.nix
+7 -40
View File
@@ -3668,9 +3668,7 @@ with pkgs;
haste-client = callPackage ../tools/misc/haste-client { };
hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
halide = callPackage ../development/compilers/halide {
llvmPackages = llvmPackages_18;
@@ -4672,9 +4670,7 @@ with pkgs;
padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
pageedit = libsForQt5.callPackage ../applications/office/PageEdit {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
pageedit = libsForQt5.callPackage ../applications/office/PageEdit { };
pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
@@ -4858,7 +4854,6 @@ with pkgs;
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix {
inherit (darwin.apple_sdk_11_0.frameworks) Foundation AppKit;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
pws = callPackage ../tools/misc/pws { };
@@ -5259,7 +5254,6 @@ with pkgs;
};
texmacs = libsForQt5.callPackage ../applications/editors/texmacs {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
extraFonts = true;
};
@@ -9052,10 +9046,6 @@ with pkgs;
ghcid = haskellPackages.ghcid.bin;
gr-framework = callPackage ../by-name/gr/gr-framework/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
graphia = qt6Packages.callPackage ../applications/science/misc/graphia { };
libgit2 = callPackage ../development/libraries/libgit2 {
@@ -10364,7 +10354,6 @@ with pkgs;
};
pcl = libsForQt5.callPackage ../development/libraries/pcl {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa AGL OpenGL;
};
@@ -10511,7 +10500,7 @@ with pkgs;
qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix {
inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit stdenv;
});
quill = callPackage ../tools/security/quill {
@@ -13135,22 +13124,8 @@ with pkgs;
av-98 = callPackage ../applications/networking/browsers/av-98 { };
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker {
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv
else
stdenv;
};
bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker {
stdenv = if stdenv.hostPlatform.isDarwin then
darwin.apple_sdk_11_0.stdenv
else
stdenv;
};
ptcollab = callPackage ../by-name/pt/ptcollab/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
bambootracker-qt6 = qt6Packages.callPackage ../applications/audio/bambootracker { };
schismtracker = callPackage ../applications/audio/schismtracker {
inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -13525,7 +13500,6 @@ with pkgs;
keepassxc = libsForQt5.callPackage ../applications/misc/keepassxc {
inherit (darwin.apple_sdk_11_0.frameworks) LocalAuthentication;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
evolution-data-server-gtk4 = evolution-data-server.override { withGtk3 = false; withGtk4 = true; };
@@ -15143,9 +15117,7 @@ with pkgs;
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
quasselClient = quassel.override {
monolithic = false;
@@ -15490,7 +15462,6 @@ with pkgs;
};
synergy = libsForQt5.callPackage ../applications/misc/synergy {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications;
};
@@ -16030,9 +16001,7 @@ with pkgs;
lua = lua5_3;
};
xpdf = libsForQt5.callPackage ../applications/misc/xpdf {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
xpdf = libsForQt5.callPackage ../applications/misc/xpdf { };
xmobar = haskellPackages.xmobar.bin;
@@ -16151,7 +16120,6 @@ with pkgs;
};
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
withGui = true;
inherit (darwin) autoSignDarwinBinariesHook;
};
@@ -16663,7 +16631,6 @@ with pkgs;
mudlet = libsForQt5.callPackage ../games/mudlet {
lua = lua5_1;
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
};
pkgs/top-level/qt6-packages.nix
+1 -1
View File
@@ -27,7 +27,7 @@ makeScopeWithSplicing' {
inherit (self) callPackage;
noExtraAttrs = set: lib.attrsets.removeAttrs set [ "extend" "override" "overrideScope" "overrideDerivation" ];
in (noExtraAttrs qt6) // {
inherit stdenv;
stdenv = lib.warn "qt6Packages.stdenv is deprecated. Use stdenv instead." stdenv;
# LIBRARIES
accounts-qt = callPackage ../development/libraries/accounts-qt { };