From cc1ef6b3cb54702c92bf35fe7beeccbd43cf2905 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 6 Apr 2024 01:53:16 +0800 Subject: [PATCH 1/2] cozy: clean up and misc fixes --- pkgs/applications/audio/cozy/default.nix | 55 +++++++++--------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index e07217567d34..36bd542eee75 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -1,52 +1,41 @@ -{ lib, fetchFromGitHub -, ninja +{ lib +, python3Packages +, fetchFromGitHub , meson +, ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils -, gtk3 -, gst_all_1 , gobject-introspection , libadwaita -, libdazzle -, python3Packages -, cairo -, gettext -, gnome -, pantheon +, gst_all_1 }: python3Packages.buildPythonApplication rec { - - format = "other"; # no setup.py - pname = "cozy"; version = "1.3.0"; + pyproject = false; # built with meson src = fetchFromGitHub { owner = "geigi"; - repo = pname; + repo = "cozy"; rev = version; hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; nativeBuildInputs = [ - meson ninja pkg-config - wrapGAppsHook + meson + ninja + pkg-config + wrapGAppsHook4 appstream-glib desktop-file-utils gobject-introspection ]; buildInputs = [ - gtk3 - cairo - gettext - gnome.adwaita-icon-theme libadwaita - libdazzle - pantheon.granite ] ++ (with gst_all_1; [ gstreamer gst-plugins-good @@ -56,32 +45,30 @@ python3Packages.buildPythonApplication rec { ]); propagatedBuildInputs = with python3Packages; [ - apsw - cairo - dbus-python distro - gst-python - magic mutagen - packaging peewee pygobject3 pytz requests ]; - postPatch = '' - patchShebangs meson/*.py + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - postInstall = '' + postFixup = '' ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy ''; meta = with lib; { - description = "A modern audio book player for Linux using GTK 3"; + description = "A modern audio book player for Linux"; homepage = "https://cozy.geigi.de/"; maintainers = [ maintainers.makefu ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; + mainProgram = "com.github.geigi.cozy"; + platforms = platforms.linux; }; } From c1b2e9f22fb4760e92e9a5b3b9c316d86f127804 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 6 Apr 2024 01:58:41 +0800 Subject: [PATCH 2/2] cozy: add aleksana as maintainer --- pkgs/applications/audio/cozy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 36bd542eee75..65cad453f6b7 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A modern audio book player for Linux"; homepage = "https://cozy.geigi.de/"; - maintainers = [ maintainers.makefu ]; + maintainers = with maintainers; [ makefu aleksana ]; license = licenses.gpl3Plus; mainProgram = "com.github.geigi.cozy"; platforms = platforms.linux;