Compare commits
3 commits
871bef56c4
...
83c0196bf3
Author | SHA1 | Date | |
---|---|---|---|
83c0196bf3 | |||
b12aaf31de | |||
e0fd68a386 |
4 changed files with 15 additions and 5 deletions
|
@ -480,6 +480,7 @@
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs; [
|
||||||
appimage-run
|
appimage-run
|
||||||
iwgtk
|
iwgtk
|
||||||
|
peakperf
|
||||||
];
|
];
|
||||||
|
|
||||||
sessionVariables = {
|
sessionVariables = {
|
||||||
|
|
|
@ -20,4 +20,7 @@ _final: prev: {
|
||||||
|
|
||||||
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
|
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
|
||||||
|
|
||||||
|
peakperf = prev.pkgs.callPackage ../pkgs/peakperf {
|
||||||
|
enableCuda = false; # peakperf needs cuda-samples, which is not available in current CUDA. CUDA 11 is broken due to CVEs in freeimage
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,11 +24,17 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ ]
|
[ ]
|
||||||
++ lib.optionals enableCuda [
|
++ lib.optionals enableCuda [
|
||||||
cudaPackages.cudart
|
cudaPackages.cuda_cudart
|
||||||
|
cudaPackages.cudatoolkit
|
||||||
|
cudaPackages.cuda-samples
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs =
|
||||||
|
[
|
||||||
cmake
|
cmake
|
||||||
|
]
|
||||||
|
++ lib.optionals enableCuda [
|
||||||
|
cudaPackages.cuda_nvcc
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
|
|
@ -233,7 +233,7 @@ in
|
||||||
doggo
|
doggo
|
||||||
easyeffects
|
easyeffects
|
||||||
fd
|
fd
|
||||||
(ffmpeg-full.override { withFrei0r = false; })
|
ffmpeg-full
|
||||||
icemon
|
icemon
|
||||||
imagemagick
|
imagemagick
|
||||||
(imv.override {
|
(imv.override {
|
||||||
|
|
Loading…
Reference in a new issue