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