diff options
| author | Dmitry Bogatov <serenity@kaction.cc> | 2022-11-10 08:10:20 -0500 |
|---|---|---|
| committer | Dmitry Bogatov <serenity@kaction.cc> | 2023-01-04 20:48:06 -0500 |
| commit | f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb (patch) | |
| tree | fd2ae89f410fa1a43bbb8ce49217d18205f9ed33 | |
| parent | e320029847a89320aa7600b57c29c1c8985717bc (diff) | |
| download | nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.tar nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.tar.gz nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.tar.bz2 nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.tar.lz nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.tar.xz nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.tar.zst nixpkgs-f1fd3f2a5d5d85954cd68e2d6c715a866a10a7fb.zip | |
pkgsStatic.protobufc: fix build
Upstream effectively puts "-lprotobuf -lprotoc" as linking flags, while in fact "protoc.a" depends on "protobuf.a", so flags should be in reverse order. It is simpler to append one more "-lprotobuf" than to make patch to fix order. That means that linker will scan "protobuf.a" twice, but price is neglectable.
| -rw-r--r-- | pkgs/development/libraries/protobufc/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index f7cf765e150..dc3b2c92f19 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , protobuf @@ -19,6 +20,14 @@ stdenv.mkDerivation rec { hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM="; }; + patches = [ + # https://github.com/protobuf-c/protobuf-c/pull/534 + (fetchpatch { + url = "https://github.com/protobuf-c/protobuf-c/commit/a6c9ea5207aeac61c57b446ddf5a6b68308881d8.patch"; + hash = "sha256-wTb8+YbvrCrOVpgthI5SJdG/CpQcOzCX4Bv47FPY804="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; |