corrscope: Migrate to by-name

NixOS · Apr 11, 2024 · 3f563e3 · 3f563e3
1 parent 94bc20a
commit 3f563e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.../applications/video/corrscope/default.nix → pkgs/by-name/co/corrscope/package.nix b/.../applications/video/corrscope/default.nix → pkgs/by-name/co/corrscope/package.nix
@@ -1,17 +1,14 @@
 { stdenv
 , lib
-, mkDerivationWith
 , python3Packages
 , fetchFromGitHub
-, wrapQtAppsHook
-, ffmpeg
-, qtbase
-, qtwayland
+, ffmpeg-full
+, libsForQt5
 , testers
 , corrscope
 }:
 
-mkDerivationWith python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "corrscope";
   version = "0.9.0";
   pyproject = true;
@@ -25,19 +22,20 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = [ "attrs" "ruamel.yaml" ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = (with libsForQt5; [
     wrapQtAppsHook
-  ] ++ (with python3Packages; [
+  ]) ++ (with python3Packages; [
     poetry-core
     pythonRelaxDepsHook
   ]);
 
   buildInputs = [
-    ffmpeg
+    ffmpeg-full
+  ] ++ (with libsForQt5; [
     qtbase
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [
     qtwayland
-  ];
+  ]);
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -58,7 +56,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
 
   preFixup = ''
     makeWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}
       "''${qtWrapperArgs[@]}"
     )
   '';

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -30387,10 +30387,6 @@ with pkgs;
     inherit (gnome2) libgnomeui GConf;
   };
 
-  corrscope = libsForQt5.callPackage ../applications/video/corrscope {
-    ffmpeg = ffmpeg-full;
-  };
-
   cpeditor = libsForQt5.callPackage ../applications/editors/cpeditor { };
 
   csa = callPackage ../applications/audio/csa { };