lol

all-packages: never inherit libiconv from darwin

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.

+3 -13
+3 -13
pkgs/top-level/all-packages.nix
··· 2087 description = mame.meta.description + " (tools only)"; 2088 } (lib.getOutput "tools" mame); 2089 2090 - mednafen = callPackage ../applications/emulators/mednafen { 2091 - inherit (darwin) libiconv; 2092 - }; 2093 2094 mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; 2095 ··· 5318 procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { 5319 inherit (darwin.apple_sdk_11_0.frameworks) Security; 5320 inherit (darwin.apple_sdk_11_0) Libsystem; 5321 - inherit (darwin) libiconv; 5322 }; 5323 5324 procyon = callPackage ../tools/misc/procyon { }; ··· 15620 }; 15621 cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; 15622 cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { 15623 - inherit (darwin) libiconv; 15624 inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; 15625 }; 15626 ··· 16537 rbenv = callPackage ../development/ruby-modules/rbenv { }; 16538 16539 inherit (callPackage ../development/interpreters/ruby { 16540 - inherit (darwin) libiconv libobjc libunwind; 16541 inherit (darwin.apple_sdk.frameworks) Foundation; 16542 }) 16543 mkRubyVersion ··· 20695 20696 libdeltachat = callPackage ../development/libraries/libdeltachat { 20697 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; 20698 - inherit (darwin) libiconv; 20699 }; 20700 20701 libdevil = callPackage ../development/libraries/libdevil { ··· 21744 21745 libxml2 = callPackage ../development/libraries/libxml2 { 21746 python = python3; 21747 - inherit (darwin) libiconv; 21748 }; 21749 21750 libxml2Python = let ··· 29176 wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; 29177 }; 29178 29179 - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { 29180 - inherit (darwin) libiconv; 29181 - }; 29182 29183 gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; 29184 ··· 31094 31095 jujutsu = callPackage ../applications/version-management/jujutsu { 31096 inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 31097 - inherit (darwin) libiconv; 31098 }; 31099 31100 nbstripout = callPackage ../applications/version-management/nbstripout { }; ··· 34990 moon-buggy = callPackage ../games/moon-buggy { }; 34991 34992 inherit (callPackages ../games/minetest { 34993 - inherit (darwin) libiconv; 34994 inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; 34995 }) 34996 minetestclient_5 minetestserver_5;
··· 2087 description = mame.meta.description + " (tools only)"; 2088 } (lib.getOutput "tools" mame); 2089 2090 + mednafen = callPackage ../applications/emulators/mednafen { }; 2091 2092 mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; 2093 ··· 5316 procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { 5317 inherit (darwin.apple_sdk_11_0.frameworks) Security; 5318 inherit (darwin.apple_sdk_11_0) Libsystem; 5319 }; 5320 5321 procyon = callPackage ../tools/misc/procyon { }; ··· 15617 }; 15618 cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; 15619 cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { 15620 inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; 15621 }; 15622 ··· 16533 rbenv = callPackage ../development/ruby-modules/rbenv { }; 16534 16535 inherit (callPackage ../development/interpreters/ruby { 16536 + inherit (darwin) libobjc libunwind; 16537 inherit (darwin.apple_sdk.frameworks) Foundation; 16538 }) 16539 mkRubyVersion ··· 20691 20692 libdeltachat = callPackage ../development/libraries/libdeltachat { 20693 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; 20694 }; 20695 20696 libdevil = callPackage ../development/libraries/libdevil { ··· 21739 21740 libxml2 = callPackage ../development/libraries/libxml2 { 21741 python = python3; 21742 }; 21743 21744 libxml2Python = let ··· 29170 wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; 29171 }; 29172 29173 + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; 29174 29175 gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; 29176 ··· 31086 31087 jujutsu = callPackage ../applications/version-management/jujutsu { 31088 inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 31089 }; 31090 31091 nbstripout = callPackage ../applications/version-management/nbstripout { }; ··· 34981 moon-buggy = callPackage ../games/moon-buggy { }; 34982 34983 inherit (callPackages ../games/minetest { 34984 inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; 34985 }) 34986 minetestclient_5 minetestserver_5;