diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-05-30 11:37:31 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-01 16:06:26 +0000 |
| commit | 8c6a3a60e5e499236a9d0e64618afeae4d56cd79 (patch) | |
| tree | 01e55336eccea8abe645fd0dcb57594041721a36 | |
| parent | Merge pull request #125229 from NixOS/backport-125225-to-release-21.05 (diff) | |
| download | nixpkgs-8c6a3a60e5e499236a9d0e64618afeae4d56cd79.tar.gz | |
libccd: fix pkgconfig file paths
libccd has the common bug of assuming CMAKE_INSTALL_*DIR is relative. I have
submitted the fix upstream, but don't have much hope of getting it merged
because there have been no updates since 2018.
(cherry picked from commit 3d2092ab58fe83e89a3162728e9d4b733295b561)
| -rw-r--r-- | pkgs/development/libraries/libccd/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/development/libraries/libccd/default.nix index a9e0c2b3feb0..c8e7c8af2104 100644 --- a/pkgs/development/libraries/libccd/default.nix +++ b/pkgs/development/libraries/libccd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "libccd"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; }; + patches = [ + # Fix pkgconfig file with absolute CMAKE_INSTALL_*DIR + # https://github.com/danfis/libccd/pull/76 + (fetchpatch { + url = "https://github.com/danfis/libccd/commit/cd16c4f168ae308e4c77db66ac97a2eaf47e059e.patch"; + sha256 = "02wj21c185kwf8bn4qi4cnna0ypzqm481xw9rr8jy1i0cb1r9idg"; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { |