diff options
Diffstat (limited to 'pkgs/development/libraries/libunistring/default.nix')
-rw-r--r-- | pkgs/development/libraries/libunistring/default.nix | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 51eb5558d626b..13ffffe6aa741 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,41 +1,56 @@ -{ fetchurl, lib, stdenv, libiconv }: +{ + fetchurl, + lib, + stdenv, + libiconv, + updateAutotoolsGnuConfigScriptsHook, + darwin +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libunistring"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz"; - sha256 = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o="; + url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz"; + hash = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4="; }; - outputs = [ "out" "dev" "info" "doc" ]; + outputs = [ + "out" + "dev" + "info" + "doc" + ]; strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - - configureFlags = [ - "--with-libiconv-prefix=${libiconv}" + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + + configureFlags = [ "--with-libiconv-prefix=${libiconv}" ]; doCheck = false; - /* This seems to cause several random failures like these, which I assume - is because of bad or missing target dependencies in their build system: + /* + This seems to cause several random failures like these, which I assume + is because of bad or missing target dependencies in their build system: - ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory - FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1) + ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory + FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1) - FAIL: unistdio/test-u16-vasnprintf3.sh - ====================================== + FAIL: unistdio/test-u16-vasnprintf3.sh + ====================================== - ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory - FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1) + ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory + FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1) */ enableParallelChecking = false; enableParallelBuilding = true; @@ -71,4 +86,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) |