diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-01 11:51:02 +0000 |
commit | aa4353b499e6950b7333578f936455a628145c31 (patch) | |
tree | c6332cedece2327a18d08794755b3fc0f9f1905b /nixpkgs/pkgs/development/libraries/elpa | |
parent | ac456d475f4e50818499b804359355c0f3b4bbf7 (diff) | |
parent | 52185f4d76c18d8348f963795dfed1de018e8dfe (diff) | |
download | nixlib-aa4353b499e6950b7333578f936455a628145c31.tar nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.gz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.bz2 nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.lz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.xz nixlib-aa4353b499e6950b7333578f936455a628145c31.tar.zst nixlib-aa4353b499e6950b7333578f936455a628145c31.zip |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/elpa')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/elpa/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/elpa/default.nix b/nixpkgs/pkgs/development/libraries/elpa/default.nix index ec108adc61eb..003de885c791 100644 --- a/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gfortran, perl -, mpi, blas, lapack, scalapack, openssh +{ lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook +, gfortran, perl, mpi, blas, lapack, scalapack, openssh # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '#!/bin/bash' '#!${stdenv.shell}' ''; - nativeBuildInputs = [ autoreconfHook perl openssh ]; + nativeBuildInputs = [ autoreconfHook perl ]; buildInputs = [ mpi blas lapack scalapack ] ++ lib.optional enableCuda cudatoolkit; @@ -76,15 +76,10 @@ stdenv.mkDerivation rec { doCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; preCheck = '' #patchShebangs ./ - # make sure the test starts even if we have less than 4 cores - export OMPI_MCA_rmaps_base_oversubscribe=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - # Run dual threaded export OMP_NUM_THREADS=2 |