From 27fbb13768319c769b2df2c32ec70b6cbc45cb5f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 28 May 2022 14:28:05 +0100 Subject: [PATCH 1/2] 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) --- pkgs/development/libraries/libnatspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index 996a8d32c62f6..dd68411c2ae80 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 ]; } From cc7b00bf1bae6fb05039be392a66c793a8665d07 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 30 May 2022 22:22:57 +0100 Subject: [PATCH 2/2] libnatspec: unmark broken on darwin (cherry picked from commit 012021659f68cfdb982b54e463eb456fc8767926) --- pkgs/development/libraries/libnatspec/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index dd68411c2ae80..304fb49f02740 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libiconv ]; meta = with lib; { - broken = stdenv.isDarwin; homepage = "http://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix;