diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 16:55:49 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:13 -0500 |
| commit | 63b41e2be7c50605ba055143b5991436af31b764 (patch) | |
| tree | f780ef21a7945f20e4c145104b0eb61ec063baa1 | |
| parent | 9c6b76f6af9fb0bf1106f821f6302e90d534f89f (diff) | |
| download | nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.tar nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.tar.gz nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.tar.bz2 nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.tar.lz nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.tar.xz nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.tar.zst nixpkgs-63b41e2be7c50605ba055143b5991436af31b764.zip | |
all-packages: remove legacy darwin.libiconv override
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3ad45d15f8..4c59ab88c61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8898,12 +8898,10 @@ with pkgs; icon-lang = callPackage ../development/interpreters/icon-lang { }; libgit2 = callPackage ../development/libraries/git2 { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security; }; libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9908,9 +9906,6 @@ with pkgs; }; libnatspec = callPackage ../development/libraries/libnatspec ( - stdenv.lib.optionalAttrs stdenv.isDarwin { - inherit (darwin) libiconv; - } ); libndp = callPackage ../development/libraries/libndp { }; @@ -11702,9 +11697,7 @@ with pkgs; stdenv = overrideCC stdenv gcc6; # upstream code incompatible with gcc7 }; - wavpack = callPackage ../development/libraries/wavpack { - inherit (darwin) libiconv; - }; + wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { graphviz = graphviz-nox; |