about summary refs log tree commit diff
path: root/pkgs/development/libraries/libccd
diff options
context:
space:
mode:
authorBen Wolsieffer <benwolsieffer@gmail.com>2021-05-30 11:37:31 -0400
committerBen Wolsieffer <benwolsieffer@gmail.com>2021-05-30 14:23:54 -0400
commit3d2092ab58fe83e89a3162728e9d4b733295b561 (patch)
treec2f7073d0b66cf573d270ebacace4814d6580811 /pkgs/development/libraries/libccd
parent2a6db4c056b66006804ec39d4185363d1d5f9658 (diff)
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.
Diffstat (limited to 'pkgs/development/libraries/libccd')
-rw-r--r--pkgs/development/libraries/libccd/default.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libccd/default.nix b/pkgs/development/libraries/libccd/default.nix
index a9e0c2b3feb0a..c8e7c8af21048 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; {