summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-05-28 14:28:05 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-05-30 21:52:26 +0000
commit27fbb13768319c769b2df2c32ec70b6cbc45cb5f (patch)
tree8166b66a5ce63bba9b2a3c215fb609a70769192b
parentMerge pull request #174954 from NixOS/backport-172391-to-release-22.05 (diff)
downloadnixpkgs-27fbb13768319c769b2df2c32ec70b6cbc45cb5f.tar.gz
libnatspec: fix build on darwin
broken in 3c12e95ad18367c92865bd13aef68c402fa76036 when parentheses were removed, changing the semantics. add libiconv universally to avoid such mixups. (cherry picked from commit 8e113240bbf7e5b630cde79b0fe27f8ed97131e7)
-rw-r--r--pkgs/development/libraries/libnatspec/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix
index 996a8d32c62f..dd68411c2ae8 100644
--- a/pkgs/development/libraries/libnatspec/default.nix
+++ b/pkgs/development/libraries/libnatspec/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = [ popt ];
+ propagatedBuildInputs = [ libiconv ];
+
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "http://natspec.sourceforge.net/";
@@ -20,6 +22,4 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
license = licenses.lgpl21;
};
-} // lib.optionalAttrs (!stdenv.isLinux) {
- propagatedBuildInputs = [ libiconv ];
}