diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/febio | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/febio')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/febio/default.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/febio/default.nix b/nixpkgs/pkgs/development/libraries/febio/default.nix index 4d01bf52bf73..d0c54b8b157d 100644 --- a/nixpkgs/pkgs/development/libraries/febio/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch b/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch index 5af10a0b3962..456179ca8364 100644 --- a/nixpkgs/pkgs/development/libraries/febio/fix-cmake.patch +++ b/nixpkgs/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 |