diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-29 00:10:19 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-29 02:05:32 +0300 |
| commit | 23b63e1fef9495a8c7cc0ba77593573911af17d3 (patch) | |
| tree | 86549f08e9e1f4d671f63760bfebbc6ad3a506ae | |
| parent | 0b863fe2dfb277b3995e53822e471fe54318329c (diff) | |
| download | nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.tar nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.tar.gz nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.tar.bz2 nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.tar.lz nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.tar.xz nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.tar.zst nixpkgs-23b63e1fef9495a8c7cc0ba77593573911af17d3.zip | |
febio: fix build
| -rw-r--r-- | pkgs/development/libraries/febio/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/febio/fix-cmake.patch | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/febio/default.nix b/pkgs/development/libraries/febio/default.nix index 4d01bf52bf7..d0c54b8b157 100644 --- a/pkgs/development/libraries/febio/default.nix +++ b/pkgs/development/libraries/febio/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 , mklSupport ? true, mkl +, substituteAll }: stdenv.mkDerivation rec { @@ -14,13 +15,18 @@ stdenv.mkDerivation rec { }; patches = [ - ./fix-cmake.patch # cannot find mkl libraries without this + (substituteAll { + src = ./fix-cmake.patch; # cannot find mkl libraries without this + so = stdenv.hostPlatform.extensions.sharedLibrary; + }) ]; cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" ++ lib.optional mklSupport "-DMKLROOT=${mkl}" ; + env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring"; + installPhase = '' runHook preInstall diff --git a/pkgs/development/libraries/febio/fix-cmake.patch b/pkgs/development/libraries/febio/fix-cmake.patch index 5af10a0b396..456179ca836 100644 --- a/pkgs/development/libraries/febio/fix-cmake.patch +++ b/pkgs/development/libraries/febio/fix-cmake.patch @@ -5,7 +5,7 @@ PATHS ${${libDir}} NO_DEFAULT_PATH) else() - find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a -+ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so ++ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}@so@ lib${ARGV3}@so@ lib${ARGV4}@so@ lib${ARGV5}@so@ lib${ARGV6}@so@ PATHS ${${libDir}} NO_DEFAULT_PATH) endif() @@ -19,7 +19,7 @@ index 2d644005f..7261ba923 100644 find_library(MKL_OMP_LIB - NAMES iomp5 iomp5md libiomp5md.lib - PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib -+ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib ++ NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib + PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib PATH_SUFFIXES "intel64" "intel32" NO_DEFAULT_PATH |