diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-01-17 20:11:43 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-01-21 12:54:25 +0000 |
| commit | 0c616684687e7b5d286e25cfea84ae9a09302fdd (patch) | |
| tree | 81f0e6bbcaf68b3dcb35ce63df43f30187f27a61 /pkgs | |
| parent | 112e7c9a8ea414ed1fe087c9906662bf9aa4dbb7 (diff) | |
| download | nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.tar nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.tar.gz nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.tar.bz2 nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.tar.lz nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.tar.xz nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.tar.zst nixpkgs-0c616684687e7b5d286e25cfea84ae9a09302fdd.zip | |
readstat: always depend on top-level libiconv
Top-level libiconv is defined per-platform. The actual libiconv library won't be built on platforms like Linux where it doesn't need to be, so there's no need to maintain a separate platform list here. Required to build for FreeBSD.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/math/readstat/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index 7621c2dfdff..cb9c16b2874 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ libiconv ]; + buildInputs = [ libiconv ]; meta = { homepage = "https://github.com/WizardMac/ReadStat"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0a0212620b..1df342fa13d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11223,9 +11223,7 @@ with pkgs; read-edid = callPackage ../os-specific/linux/read-edid { }; - readstat = callPackage ../applications/science/math/readstat { - inherit (pkgs.darwin) libiconv; - }; + readstat = callPackage ../applications/science/math/readstat { }; redir = callPackage ../tools/networking/redir { }; |