diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/by-name/df/dfasma/package.nix similarity index 85% rename from pkgs/applications/audio/dfasma/default.nix rename to pkgs/by-name/df/dfasma/package.nix index dd3827ab8a19..96ad53f3bb7b 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/by-name/df/dfasma/package.nix @@ -1,12 +1,10 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, fftw, libsndfile, - qtbase, - qtmultimedia, - qmake, + libsForQt5, }: let @@ -36,13 +34,13 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dfasma"; version = "1.4.5"; src = fetchFromGitHub { sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; repo = "dfasma"; owner = "gillesdegottex"; }; @@ -50,11 +48,14 @@ mkDerivation rec { buildInputs = [ fftw libsndfile - qtbase - qtmultimedia + libsForQt5.qtbase + libsForQt5.qtmultimedia ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; postPatch = '' cp -Rv "${reaperFork.src}"/* external/REAPER @@ -62,7 +63,7 @@ mkDerivation rec { substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" ""; ''; - meta = with lib; { + meta = { description = "Analyse and compare audio files in time and frequency"; mainProgram = "dfasma"; longDescription = '' @@ -75,9 +76,9 @@ mkDerivation rec { ''; homepage = "https://gillesdegottex.gitlab.io/dfasma-website/"; license = [ - licenses.gpl3Plus + lib.licenses.gpl3Plus reaperFork.meta.license ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0e4d8350ee..a820d305ac35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10934,8 +10934,6 @@ with pkgs; inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop; - dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; djview4 = djview;