nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #148018 from NixOS/backport-147935-to-release-21.11

Browse Source 
[Backport release-21.11] cppe, python3Packages.cppe: fix build with clang
This commit is contained in:
Robert Scott
2021-11-30 22:24:33 +00:00
committed by GitHub
parent 41eb5d0d3b d7839267cb
commit 6bfd8c700f
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/science/chemistry/cppe/default.nix
View File

@@ -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" ];

9
pkgs/development/python-modules/cppe/default.nix
View File

@@ -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