ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-19 11:41:43 +03:00
Code Issues Projects Releases Wiki Activity

all-packages: never inherit libiconv from darwin

Browse Source 
libiconv and darwin.libiconv are the same thing on Darwin, but using
darwin.libiconv means that packages will necessarily not be correct
for other platforms where we don't include libiconv in libc, like
FreeBSD.
This commit is contained in:
Alyssa Ross 2023-01-22 12:42:56 +00:00
parent 08d2a9eb2a
commit bee40cfe26
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/top-level/all-packages.nix
View File

@ -2087,9 +2087,7 @@ with pkgs;
description = mame.meta.description + " (tools only)";
} (lib.getOutput "tools" mame);
mednafen = callPackage ../applications/emulators/mednafen {
inherit (darwin) libiconv;
};
mednafen = callPackage ../applications/emulators/mednafen { };
mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { };
@ -5318,7 +5316,6 @@ with pkgs;
procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs {
inherit (darwin.apple_sdk_11_0.frameworks) Security;
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin) libiconv;
};
procyon = callPackage ../tools/misc/procyon { };
@ -15620,7 +15617,6 @@ with pkgs;
};
cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
cargo-geiger = callPackage ../development/tools/rust/cargo-geiger {
inherit (darwin) libiconv;
inherit (darwin.apple_sdk.frameworks) Security CoreFoundation;
};
@ -16537,7 +16533,7 @@ with pkgs;
rbenv = callPackage ../development/ruby-modules/rbenv { };
inherit (callPackage ../development/interpreters/ruby {
inherit (darwin) libiconv libobjc libunwind;
inherit (darwin) libobjc libunwind;
inherit (darwin.apple_sdk.frameworks) Foundation;
})
mkRubyVersion
@ -20695,7 +20691,6 @@ with pkgs;
libdeltachat = callPackage ../development/libraries/libdeltachat {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
inherit (darwin) libiconv;
};
libdevil = callPackage ../development/libraries/libdevil {
@ -21744,7 +21739,6 @@ with pkgs;
libxml2 = callPackage ../development/libraries/libxml2 {
python = python3;
inherit (darwin) libiconv;
};
libxml2Python = let
@ -29176,9 +29170,7 @@ with pkgs;
wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { };
};
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
@ -31094,7 +31086,6 @@ with pkgs;
jujutsu = callPackage ../applications/version-management/jujutsu {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
inherit (darwin) libiconv;
};
nbstripout = callPackage ../applications/version-management/nbstripout { };
@ -34990,7 +34981,6 @@ with pkgs;
moon-buggy = callPackage ../games/moon-buggy { };
inherit (callPackages ../games/minetest {
inherit (darwin) libiconv;
inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
})
minetestclient_5 minetestserver_5;