diff options
| author | Ryan Burns <52847440+r-burns@users.noreply.github.com> | 2023-01-07 11:58:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 11:58:27 -0800 |
| commit | 1669256c6461e935f1f86013ee30ff8ede4eee2f (patch) | |
| tree | 22dfb3a198857f49b8cae09c51975c88181cfb5b | |
| parent | 960e7415c167f572e7c4c45e1f6df70d068c3176 (diff) | |
| parent | 248efc2b1792b8db75138bf36ff779778674e6ed (diff) | |
Merge pull request #209256 from KAction/patch/v1/pkgsStatic.gsasl
pkgsStatic.gsasl: fix build
| -rw-r--r-- | pkgs/development/libraries/gsasl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/gsasl/gsasl.patch | 21 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index cbfddde09a02..c1003a6e33f6 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -9,6 +9,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-ebho47mXbcSE1ZspygroiXvpbOTTbTKu1dk1p6Mwd1k="; }; + # This is actually bug in musl. It is already fixed in trunc and + # this patch won't be necessary with musl > 1.2.3. + # + # https://git.musl-libc.org/cgit/musl/commit/?id=b50eb8c36c20f967bd0ed70c0b0db38a450886ba + patches = lib.optional stdenv.hostPlatform.isMusl ./gsasl.patch; + buildInputs = [ libidn libkrb5 ]; configureFlags = [ "--with-gssapi-impl=mit" ]; diff --git a/pkgs/development/libraries/gsasl/gsasl.patch b/pkgs/development/libraries/gsasl/gsasl.patch new file mode 100644 index 000000000000..572d3034967e --- /dev/null +++ b/pkgs/development/libraries/gsasl/gsasl.patch @@ -0,0 +1,21 @@ +GNU libc and Musl libc have different ideas what + + strverscmp("UNKNOWN", "2.2.0") + +should return. Hopefully nobody depend on this particular behaviour in +practice. + +--- a/tests/version.c 1970-01-01 00:00:00.000000000 -0000 ++++ b/tests/version.c 1970-01-01 00:00:00.000000000 -0000 +@@ -111,11 +111,5 @@ + exit_code = EXIT_FAILURE; + } + +- if (gsasl_check_version ("UNKNOWN")) +- { +- printf ("FAIL: gsasl_check_version (UNKNOWN)\n"); +- exit_code = EXIT_FAILURE; +- } +- + return exit_code; + } |