diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-06-01 19:32:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 19:32:36 +0100 |
| commit | 6f38e99a9e927ffd6ae3ce067630e191f18b5587 (patch) | |
| tree | cd5cceb95cbed3712d9152f81d992b9dd921a661 | |
| parent | Merge pull request #125247 from NixOS/backport-124996-to-release-21.05 (diff) | |
| parent | libccd: fix pkgconfig file paths (diff) | |
| download | nixpkgs-6f38e99a9e927ffd6ae3ce067630e191f18b5587.tar.gz | |
Merge pull request #125248 from NixOS/backport-124986-to-release-21.05
[Backport release-21.05] libccd: fix pkgconfig file paths
| -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; { |