diff options
author | Niklas Hambüchen <mail@nh2.me> | 2021-11-19 02:44:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-19 02:44:01 +0100 |
commit | 5e59d5714a57f253ada26c4ba49f8ecb74a90e21 (patch) | |
tree | 963ac4199068e2da8c1caf0ab87319125504b767 | |
parent | 5a26cb7b3fefecdf782cee124bb9d11d6de5f6c2 (diff) | |
parent | e068dbd97702ec6d0b3da6c45b273fbb9c336889 (diff) |
Merge pull request #144169 from NixOS/libyaml-cpp-fix-pc-file
libyaml-cpp: Fix wrong paths in pkg-config .pc file.
-rw-r--r-- | pkgs/development/libraries/libyaml-cpp/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 0c3eb363a6bc1..28156e3e205ff 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; }) + # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available + (fetchpatch { + name = "libyaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patchj"; + url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; + sha256 = "12g5h7lxzd5v16ykay03zww5g28j3k69k228yr3v8fnmyv2spkfl"; + }) ]; nativeBuildInputs = [ cmake ]; |