diff options
| author | Domen Kožar <domen@dev.si> | 2021-11-30 14:59:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 14:59:52 +0100 |
| commit | 7f8ebc6d42e0ed6a0c548fb7f88358270f7e46db (patch) | |
| tree | 9b5ec5c9b90cb9baf42385bd7a4f9f678e1402be | |
| parent | nixos/acme: fix typo in docs (diff) | |
| parent | python3Packages.cppe: fix build with clang (diff) | |
| download | nixpkgs-7f8ebc6d42e0ed6a0c548fb7f88358270f7e46db.tar.gz | |
Merge pull request #147935 from risicle/ris-cppe-clang
cppe, python3Packages.cppe: fix build with clang
| -rw-r--r-- | pkgs/development/libraries/science/chemistry/cppe/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/cppe/default.nix | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/science/chemistry/cppe/default.nix b/pkgs/development/libraries/science/chemistry/cppe/default.nix index 51083e5a2ae9..9781ce780660 100644 --- a/pkgs/development/libraries/science/chemistry/cppe/default.nix +++ b/pkgs/development/libraries/science/chemistry/cppe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake }: +{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages }: stdenv.mkDerivation rec { pname = "cppe"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; diff --git a/pkgs/development/python-modules/cppe/default.nix b/pkgs/development/python-modules/cppe/default.nix index df00bd8dd120..52031bab74f7 100644 --- a/pkgs/development/python-modules/cppe/default.nix +++ b/pkgs/development/python-modules/cppe/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , lib +, stdenv , cmake , cppe , eigen @@ -12,6 +13,7 @@ , pandas , polarizationsolver , pytest +, llvmPackages }: buildPythonPackage rec { @@ -31,7 +33,12 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = [ pybind11 ]; + buildInputs = [ pybind11 ] + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + + NIX_CFLAGS_LINK = lib.optional stdenv.cc.isClang "-lomp"; + + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; checkInputs = [ pytest |