From 5a87b6ae4bc71a14901de052cacd6b2fcead5cb6 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Sat, 18 Oct 2025 15:38:10 -0700 Subject: [PATCH] easyaudiosync: modernize, move to by-name/ --- .../easyaudiosync/0001-fix-project-name.patch | 0 .../easyaudiosync/0003-fix-darwin-app.patch | 0 .../ea}/easyaudiosync/0004-force-qt6.patch | 0 .../ea/easyaudiosync/package.nix} | 24 +++++++++---------- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 11 insertions(+), 15 deletions(-) rename pkgs/{applications/audio => by-name/ea}/easyaudiosync/0001-fix-project-name.patch (100%) rename pkgs/{applications/audio => by-name/ea}/easyaudiosync/0003-fix-darwin-app.patch (100%) rename pkgs/{applications/audio => by-name/ea}/easyaudiosync/0004-force-qt6.patch (100%) rename pkgs/{applications/audio/easyaudiosync/default.nix => by-name/ea/easyaudiosync/package.nix} (87%) diff --git a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch b/pkgs/by-name/ea/easyaudiosync/0001-fix-project-name.patch similarity index 100% rename from pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch rename to pkgs/by-name/ea/easyaudiosync/0001-fix-project-name.patch diff --git a/pkgs/applications/audio/easyaudiosync/0003-fix-darwin-app.patch b/pkgs/by-name/ea/easyaudiosync/0003-fix-darwin-app.patch similarity index 100% rename from pkgs/applications/audio/easyaudiosync/0003-fix-darwin-app.patch rename to pkgs/by-name/ea/easyaudiosync/0003-fix-darwin-app.patch diff --git a/pkgs/applications/audio/easyaudiosync/0004-force-qt6.patch b/pkgs/by-name/ea/easyaudiosync/0004-force-qt6.patch similarity index 100% rename from pkgs/applications/audio/easyaudiosync/0004-force-qt6.patch rename to pkgs/by-name/ea/easyaudiosync/0004-force-qt6.patch diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/by-name/ea/easyaudiosync/package.nix similarity index 87% rename from pkgs/applications/audio/easyaudiosync/default.nix rename to pkgs/by-name/ea/easyaudiosync/package.nix index a6f744db1b65..d57c432005e4 100644 --- a/pkgs/applications/audio/easyaudiosync/default.nix +++ b/pkgs/by-name/ea/easyaudiosync/package.nix @@ -4,24 +4,22 @@ fetchFromGitHub, pkg-config, cmake, - qtbase, - qttools, spdlog, ffmpeg, taglib, - wrapQtAppsHook, + kdePackages, makeDesktopItem, copyDesktopItems, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "easyaudiosync"; version = "1.1.2"; src = fetchFromGitHub { owner = "complexlogic"; repo = "EasyAudioSync"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc="; }; @@ -34,13 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + kdePackages.wrapQtAppsHook ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ - qtbase - qttools + kdePackages.qtbase + kdePackages.qttools ffmpeg spdlog taglib @@ -82,7 +80,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "Audio library syncing and conversion utility"; longDescription = '' Easy Audio Sync is an audio library syncing and conversion utility. @@ -94,8 +92,8 @@ stdenv.mkDerivation rec { GUI-based instead of CLI-based. ''; homepage = "https://github.com/complexlogic/EasyAudioSync"; - license = licenses.unlicense; - maintainers = with maintainers; [ matteopacini ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ matteopacini ]; + platforms = with lib.platforms; linux ++ darwin; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffcece520160..024aa65180de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1952,8 +1952,6 @@ with pkgs; enableSSH = true; }; - easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync { }; - easycrypt = callPackage ../applications/science/logic/easycrypt { why3 = pkgs.why3.override { ideSupport = false;