diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/libmusicbrainz | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libmusicbrainz')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch | 22 |
2 files changed, 27 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix index 60a6c4f69eb7..a77d64ffddce 100644 --- a/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/default.nix @@ -12,8 +12,12 @@ stdenv.mkDerivation rec { sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z"; }; + patches = [ + # Fix spacing around string literal for modern clang + ./v3-darwin.patch + ]; + meta = with lib; { - broken = stdenv.isDarwin; homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch b/nixpkgs/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch new file mode 100644 index 000000000000..af97eaff1ed3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch @@ -0,0 +1,22 @@ +diff --git a/src/webservice.cpp b/src/webservice.cpp +index 3a36167..df14812 100644 +--- a/src/webservice.cpp ++++ b/src/webservice.cpp +@@ -184,7 +184,7 @@ WebService::get(const std::string &entity, + if (!sess) + throw WebServiceError("ne_session_create() failed."); + ne_set_server_auth(sess, httpAuth, this); +- ne_set_useragent(sess, PACKAGE"/"VERSION); ++ ne_set_useragent(sess, PACKAGE "/" VERSION); + + // Use proxy server + if (!d->proxyHost.empty()) { +@@ -269,7 +269,7 @@ WebService::post(const std::string &entity, + if (!sess) + throw WebServiceError("ne_session_create() failed."); + ne_set_server_auth(sess, httpAuth, this); +- ne_set_useragent(sess, PACKAGE"/"VERSION); ++ ne_set_useragent(sess, PACKAGE "/" VERSION); + + // Use proxy server + if (!d->proxyHost.empty()) { |