Skip to content

gsl,tbb: split output #212787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artturin merged 4 commits into from
Jan 31, 2023
Merged

gsl,tbb: split output #212787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f386825
tbb: split output
Artturin Jan 26, 2023
092c2b3
gsl: split output
Artturin Jan 26, 2023
c0548dd
python310Packages.cvxopt: use lib.getX
Artturin Jan 26, 2023
37dede4
octopus: use lib.getX
Artturin Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/applications/science/chemistry/octopus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/libraries/gsl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=";
Expand All @@ -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";

Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/libraries/tbb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
pname = "tbb";
version = "2020.3";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneTBB";
Expand Down
12 changes: 6 additions & 6 deletions pkgs/development/python-modules/cvxopt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,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 ];
Expand Down