diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2022-01-09 19:43:12 -0500 |
---|---|---|
committer | ehmry <ehmry@posteo.net> | 2022-01-22 10:40:04 +0100 |
commit | e9b691ea5d3eb07aa25256563f37a45d4fcdb72a (patch) | |
tree | 6fb78562541461e651e5e4e5199802437049ac69 /pkgs/development/libraries/assimp/default.nix | |
parent | db32554265faabe0d0433275c9f1f4a453593e1a (diff) | |
download | nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.tar nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.tar.gz nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.tar.bz2 nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.tar.lz nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.tar.xz nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.tar.zst nixpkgs-e9b691ea5d3eb07aa25256563f37a45d4fcdb72a.zip |
assimp: fix include directory with split outputs
Assimp used a hardcoded path to the include directory, which doesn't work with split outputs. The included patch has been accepted upstream.
Diffstat (limited to 'pkgs/development/libraries/assimp/default.nix')
-rw-r--r-- | pkgs/development/libraries/assimp/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index a98242f9c7c..804c97ffd74 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib }: stdenv.mkDerivation rec { pname = "assimp"; @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { hash = "sha256-GNSfaP8O5IsjGwtC3DFaV4OiMMUXIcmHmz+5TCT/HP8="; }; + patches = [ + # Fix include directory with split outputs + # https://github.com/assimp/assimp/pull/4337 + (fetchpatch { + url = "https://github.com/assimp/assimp/commit/5dcaf445c3da079cf43890a0688428a7e1de0b30.patch"; + sha256 = "sha256-KwqTAoDPkhFq469+VaUuGoqfymu2bWLG9W3BvFvyU5I="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; |