diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/by-name/si | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/by-name/si')
| -rw-r--r-- | nixpkgs/pkgs/by-name/si/signaturepdf/package.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/si/sirius/package.nix | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix b/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix index d7d18509ac51..34eaab9213ed 100644 --- a/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix +++ b/nixpkgs/pkgs/by-name/si/signaturepdf/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --run 'echo "You may now open a web browser on http://localhost:$port"' \ --add-flags '-S "localhost:$port" -t public' - runHook preInstall + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/by-name/si/sirius/package.nix b/nixpkgs/pkgs/by-name/si/sirius/package.nix index 8518092203b8..c09b9360419e 100644 --- a/nixpkgs/pkgs/by-name/si/sirius/package.nix +++ b/nixpkgs/pkgs/by-name/si/sirius/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { cmake gfortran pkg-config - ]; + ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; buildInputs = [ blas @@ -72,8 +72,12 @@ stdenv.mkDerivation rec { eigen libvdwxc ] - ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit - ++ lib.optionals (gpuBackend == "rocm") [ + ++ lib.optionals (gpuBackend == "cuda") [ + cudaPackages.cuda_cudart + cudaPackages.cuda_profiler_api + cudaPackages.cudatoolkit + cudaPackages.libcublas + ] ++ lib.optionals (gpuBackend == "rocm") [ rocmPackages.clr rocmPackages.rocblas ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp @@ -81,6 +85,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ mpi ]; + CXXFLAGS = [ + # GCC 13: error: 'uintptr_t' in namespace 'std' does not name a type + "-include cstdint" + ]; + cmakeFlags = [ "-DUSE_SCALAPACK=ON" "-DBUILD_TESTING=ON" |