diff options
| author | Matt Huszagh <huszaghmatt@gmail.com> | 2019-10-20 17:56:34 -0700 |
|---|---|---|
| committer | Matt Huszagh <huszaghmatt@gmail.com> | 2020-08-07 09:20:32 -0700 |
| commit | dd25bb756a305df1b0476ad192446135cbc3fe61 (patch) | |
| tree | 0fbffd7e0f61d5bd695764ae2e028c5d6142c39a /pkgs/development/libraries/CGAL | |
| parent | cb37cdfcf7a9143f65f5748e3a9669a3503ba95f (diff) | |
| download | nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.tar nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.tar.gz nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.tar.bz2 nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.tar.lz nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.tar.xz nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.tar.zst nixpkgs-dd25bb756a305df1b0476ad192446135cbc3fe61.zip | |
cgal: add patch so include files can be found by dependent packages
Diffstat (limited to 'pkgs/development/libraries/CGAL')
| -rw-r--r-- | pkgs/development/libraries/CGAL/cgal_path.patch | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/CGAL/default.nix | 12 |
2 files changed, 25 insertions, 2 deletions
diff --git a/pkgs/development/libraries/CGAL/cgal_path.patch b/pkgs/development/libraries/CGAL/cgal_path.patch new file mode 100644 index 00000000000..68eec5fbb21 --- /dev/null +++ b/pkgs/development/libraries/CGAL/cgal_path.patch @@ -0,0 +1,15 @@ +--- Installation/cmake/modules/CGALConfig_install.cmake.in.original 2019-07-10 10:39:12.377022659 -0700 ++++ Installation/cmake/modules/CGALConfig_install.cmake.in 2019-07-10 10:47:24.310154928 -0700 +@@ -45,9 +45,9 @@ + set(CGAL_SHARED_LINKER_FLAGS_DEBUG_INIT "@CMAKE_SHARED_LINKER_FLAGS_DEBUG@" ) + set(CGAL_BUILD_TYPE_INIT "@CMAKE_BUILD_TYPE@" ) + +-set(CGAL_INCLUDE_DIRS "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_INC_DIR@" ) +-set(CGAL_MODULES_DIR "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_CMAKE_DIR@" ) +-set(CGAL_LIBRARIES_DIR "${CGAL_INSTALL_PREFIX}/@CGAL_INSTALL_LIB_DIR@" ) ++set(CGAL_INCLUDE_DIRS "@CGAL_INSTALL_INC_DIR@" ) ++set(CGAL_MODULES_DIR "@CGAL_INSTALL_CMAKE_DIR@" ) ++set(CGAL_LIBRARIES_DIR "@CGAL_INSTALL_LIB_DIR@" ) + + # If CGAL_ImageIO is built, tell if it was linked with Zlib. + set(CGAL_ImageIO_USE_ZLIB "@CGAL_ImageIO_USE_ZLIB@" ) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 16a643e2a7f..62f11a7a725 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,8 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: +{ stdenv +, fetchFromGitHub +, cmake +, boost +, gmp +, mpfr +}: stdenv.mkDerivation rec { + pname = "cgal"; version = "5.0.2"; - name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; @@ -16,6 +22,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost gmp mpfr ]; nativeBuildInputs = [ cmake ]; + patches = [ ./cgal_path.patch ]; + doCheck = false; meta = with stdenv.lib; { |