From 896be7ba148917d93fb4aa6c9c0e883faaf3f498 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 4 Jan 2025 00:15:06 +0100 Subject: [PATCH] treewide: replace darwin.apple_sdk_11_0.stdenv with stdenv on darwin --- .../default.nix => by-name/ch/chatterino2/package.nix} | 0 .../default.nix => by-name/li/libjodycode/package.nix} | 0 pkgs/top-level/all-packages.nix | 10 ---------- 3 files changed, 10 deletions(-) rename pkgs/{applications/networking/instant-messengers/chatterino2/default.nix => by-name/ch/chatterino2/package.nix} (100%) rename pkgs/{development/libraries/libjodycode/default.nix => by-name/li/libjodycode/package.nix} (100%) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/by-name/ch/chatterino2/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/chatterino2/default.nix rename to pkgs/by-name/ch/chatterino2/package.nix diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/by-name/li/libjodycode/package.nix similarity index 100% rename from pkgs/development/libraries/libjodycode/default.nix rename to pkgs/by-name/li/libjodycode/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73be6f12fcbb..c9171776d3d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9482,11 +9482,6 @@ with pkgs; json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml; - libjodycode = callPackage ../development/libraries/libjodycode { - # missing aligned_alloc() - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { }; keybinder = callPackage ../development/libraries/keybinder { @@ -15890,10 +15885,6 @@ with pkgs; xwaylandSupport = false; }; - chatterino2 = callPackage ../applications/networking/instant-messengers/chatterino2 { - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - wgnord = callPackage ../applications/networking/wgnord/default.nix { }; whalebird = callPackage ../applications/misc/whalebird { @@ -16159,7 +16150,6 @@ with pkgs; }; groestlcoin = libsForQt5.callPackage ../applications/blockchains/groestlcoin { - stdenv = darwin.apple_sdk_11_0.stdenv; withGui = true; inherit (darwin) autoSignDarwinBinariesHook; };