dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #212787 from Artturin/splitthings2

Browse Source
This commit is contained in:
Artturi 2023-01-31 15:58:27 +02:00 committed by GitHub
commit 3e3c0cfbf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/chemistry/octopus/default.nix
View File

@ -41,12 +41,12 @@ stdenv.mkDerivation rec {
];
configureFlags = with lib; [
"--with-yaml-prefix=${libyaml}"
"--with-yaml-prefix=${lib.getDev libyaml}"
"--with-blas=-lblas"
"--with-lapack=-llapack"
"--with-fftw-prefix=${fftw.dev}"
"--with-gsl-prefix=${gsl}"
"--with-libxc-prefix=${libxc}"
"--with-fftw-prefix=${lib.getDev fftw}"
"--with-gsl-prefix=${lib.getDev gsl}"
"--with-libxc-prefix=${lib.getDev libxc}"
"--enable-openmp"
] ++ optional enableFma "--enable-fma3"
++ optional enableFma4 "--enable-fma4"

6
pkgs/development/libraries/gsl/default.nix
View File

@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
pname = "gsl";
version = "2.7.1";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnu/gsl/${pname}-${version}.tar.gz";
sha256 = "sha256-3LD71DBIgyt1f/mUJpGo3XACbV2g/4VgHlJof23us0s=";
@ -13,6 +15,10 @@ stdenv.mkDerivation rec {
MACOSX_DEPLOYMENT_TARGET=10.16
'' else null;
postInstall = ''
moveToOutput bin/gsl-config "$dev"
'';
# do not let -march=skylake to enable FMA (https://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html)
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isx86_64 "-mno-fma";

2
pkgs/development/libraries/tbb/default.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
pname = "tbb";
version = "2020.3";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";

12
pkgs/development/python-modules/cvxopt/default.nix
View File

@ -51,16 +51,16 @@ buildPythonPackage rec {
export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include
'' + lib.optionalString withGsl ''
export CVXOPT_BUILD_GSL=1
export CVXOPT_GSL_LIB_DIR=${gsl}/lib
export CVXOPT_GSL_INC_DIR=${gsl}/include
export CVXOPT_GSL_LIB_DIR=${lib.getLib gsl}/lib
export CVXOPT_GSL_INC_DIR=${lib.getDev gsl}/include
'' + lib.optionalString withGlpk ''
export CVXOPT_BUILD_GLPK=1
export CVXOPT_GLPK_LIB_DIR=${glpk}/lib
export CVXOPT_GLPK_INC_DIR=${glpk}/include
export CVXOPT_GLPK_LIB_DIR=${lib.getLib glpk}/lib
export CVXOPT_GLPK_INC_DIR=${lib.getDev glpk}/include
'' + lib.optionalString withFftw ''
export CVXOPT_BUILD_FFTW=1
export CVXOPT_FFTW_LIB_DIR=${fftw}/lib
export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include
export CVXOPT_FFTW_LIB_DIR=${lib.getLib fftw}/lib
export CVXOPT_FFTW_INC_DIR=${lib.getDev fftw}/include
'';
nativeCheckInputs = [ unittestCheckHook ];