pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #147935 from risicle/ris-cppe-clang

cppe, python3Packages.cppe: fix build with clang

authored by

Domen Kožar and committed by
GitHub 7f8ebc6d de6181dc

+11 -3
unified split
+3 -2
pkgs/development/libraries/science/chemistry/cppe/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake }: 2 3 stdenv.mkDerivation rec { 4 pname = "cppe"; ··· 11 sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; 12 }; 13 14 - nativeBuildInputs = [ cmake ]; 15 16 cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; 17
··· 1 + { stdenv, lib, fetchFromGitHub, cmake, llvmPackages }: 2 3 stdenv.mkDerivation rec { 4 pname = "cppe"; ··· 11 sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw="; 12 }; 13 14 + nativeBuildInputs = [ cmake ] 15 + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; 16 17 cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; 18
+8 -1
pkgs/development/python-modules/cppe/default.nix
··· 1 { buildPythonPackage 2 , lib 3 , cmake 4 , cppe 5 , eigen ··· 12 , pandas 13 , polarizationsolver 14 , pytest 15 }: 16 17 buildPythonPackage rec { ··· 31 32 dontUseCmakeConfigure = true; 33 34 - buildInputs = [ pybind11 ]; 35 36 checkInputs = [ 37 pytest
··· 1 { buildPythonPackage 2 , lib 3 + , stdenv 4 , cmake 5 , cppe 6 , eigen ··· 13 , pandas 14 , polarizationsolver 15 , pytest 16 + , llvmPackages 17 }: 18 19 buildPythonPackage rec { ··· 33 34 dontUseCmakeConfigure = true; 35 36 + buildInputs = [ pybind11 ] 37 + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; 38 + 39 + NIX_CFLAGS_LINK = lib.optional stdenv.cc.isClang "-lomp"; 40 + 41 + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; 42 43 checkInputs = [ 44 pytest