machines/mimir/configuration.nix

@@ -480,7 +480,6 @@
     systemPackages = with pkgs; [
       appimage-run
       iwgtk
-      peakperf
     ];
 
     sessionVariables = {

overlays/default.nix

@@ -20,7 +20,4 @@ _final: prev: {
 
   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
-  };
 }

pkgs/peakperf/default.nix

@@ -24,17 +24,11 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   buildInputs =
     [ ]
     ++ lib.optionals enableCuda [
-      cudaPackages.cuda_cudart
-      cudaPackages.cudatoolkit
-      cudaPackages.cuda-samples
+      cudaPackages.cudart
     ];
 
-  nativeBuildInputs =
-    [
+  nativeBuildInputs = [
     cmake
-    ]
-    ++ lib.optionals enableCuda [
-      cudaPackages.cuda_nvcc
   ];
 
   meta = {

users/erwin/work.nix

@@ -233,7 +233,7 @@ in
             doggo
             easyeffects
             fd
-            ffmpeg-full
+            (ffmpeg-full.override { withFrei0r = false; })
             icemon
             imagemagick
             (imv.override {