diff options
| author | OPNA2608 <opna2608@protonmail.com> | 2024-03-13 16:38:35 +0100 |
|---|---|---|
| committer | OPNA2608 <opna2608@protonmail.com> | 2024-04-11 23:14:58 +0200 |
| commit | 3f563e3b755177f0bb35d712674c9d4252b55e76 (patch) | |
| tree | 4ffe8843d8e7f82c9aac1f0111acb93f3be780c6 | |
| parent | 94bc20ad0f8f8f09dc115d10739f15f5f0bf11ed (diff) | |
corrscope: Migrate to by-name
| -rw-r--r-- | pkgs/by-name/co/corrscope/package.nix (renamed from pkgs/applications/video/corrscope/default.nix) | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 15 deletions
diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/by-name/co/corrscope/package.nix index 088e72456f380..fbf46fc4aae89 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/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 index cdaa063bcdd3e..726b4edc4a809 100644 --- 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 { }; |