From 0c616684687e7b5d286e25cfea84ae9a09302fdd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 17 Jan 2023 20:11:43 +0000 Subject: [PATCH] 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. --- pkgs/applications/science/math/readstat/default.nix | 2 +- 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 7621c2dfdff7..cb9c16b28744 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 c0a0212620b4..1df342fa13dd 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 { };