diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-12 02:31:21 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-02-12 02:31:41 +0100 |
| commit | 5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d (patch) | |
| tree | f4493dcb4f021d3385c78df944d573c7005c7dc8 /pkgs/development/libraries/libidn2 | |
| parent | 123cbd40c244c84a1caebce9082aa3704be7f57c (diff) | |
| download | nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.tar nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.tar.gz nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.tar.bz2 nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.tar.lz nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.tar.xz nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.tar.zst nixpkgs-5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d.zip | |
libidn2: fix darwin build
cc #22595
Diffstat (limited to 'pkgs/development/libraries/libidn2')
| -rw-r--r-- | pkgs/development/libraries/libidn2/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/libidn2/fix-error-darwin.patch | 31 |
2 files changed, 37 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 083b04d4b09..ea26f480cd1 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, libiconv, libunistring }: +{ fetchurl, stdenv, libiconv, libunistring, help2man }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-0.16"; @@ -10,8 +12,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; + patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + buildInputs = [ libunistring ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ optionals stdenv.isDarwin [ libiconv help2man ]; meta = { homepage = "https://www.gnu.org/software/libidn/#libidn2"; diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch new file mode 100644 index 00000000000..db3edd6e4a0 --- /dev/null +++ b/pkgs/development/libraries/libidn2/fix-error-darwin.patch @@ -0,0 +1,31 @@ +diff --git a/src/idn2.c b/src/idn2.c +index 6abbc72..804f0f2 100644 +--- a/src/idn2.c ++++ b/src/idn2.c +@@ -31,7 +31,6 @@ + #include <unistr.h> + + /* Gnulib headers. */ +-#include "error.h" + #include "gettext.h" + #define _(String) dgettext (PACKAGE, String) + #include "progname.h" +@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags) + free (output); + } + else +- error (EXIT_FAILURE, 0, "%s: %s", +- args_info.register_given ? "register" : "lookup", +- idn2_strerror (rc)); ++ perror (idn2_strerror (rc)); + } + + int +@@ -222,7 +219,7 @@ main (int argc, char *argv[]) + } + + if (ferror (stdin)) +- error (EXIT_FAILURE, errno, "%s", _("input error")); ++ perror (_("input error")); + + cmdline_parser_free (&args_info); |