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

all-packages: remove legacy darwin.libiconv override

Browse Source
This commit is contained in:
Matthew Bauer 2018-03-14 16:55:49 -05:00
parent 9c6b76f6af
commit 63b41e2be7
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8898,12 +8898,10 @@ with pkgs;
icon-lang = callPackage ../development/interpreters/icon-lang { }; icon-lang = callPackage ../development/interpreters/icon-lang { };
libgit2 = callPackage ../development/libraries/git2 { libgit2 = callPackage ../development/libraries/git2 {
inherit (darwin) libiconv;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix { libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix {
inherit (darwin) libiconv;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
@ -9908,9 +9906,6 @@ with pkgs;
}; };
libnatspec = callPackage ../development/libraries/libnatspec ( libnatspec = callPackage ../development/libraries/libnatspec (
stdenv.lib.optionalAttrs stdenv.isDarwin {
inherit (darwin) libiconv;
}
); );
libndp = callPackage ../development/libraries/libndp { }; libndp = callPackage ../development/libraries/libndp { };
@ -11702,9 +11697,7 @@ with pkgs;
stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7 stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7
}; };
wavpack = callPackage ../development/libraries/wavpack { wavpack = callPackage ../development/libraries/wavpack { };
inherit (darwin) libiconv;
};
wayland = callPackage ../development/libraries/wayland { wayland = callPackage ../development/libraries/wayland {
graphviz = graphviz-nox; graphviz = graphviz-nox;