public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125248 from NixOS/backport-124986-to-release-21.05

Browse Source 
[Backport release-21.05] libccd: fix pkgconfig file paths
This commit is contained in:
Robert Scott 2021-06-01 19:32:36 +01:00 committed by GitHub
commit 6f38e99a9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libccd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }: { lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libccd"; pname = "libccd";
@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0sfmn5pd7k5kyhbxnd689xmsa5v843r7sska96dlysqpljd691jc"; 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 ]; nativeBuildInputs = [ cmake ];
meta = with lib; { meta = with lib; {