Merge pull request #301895 from Aleksanaa/cozy

cozy: clean up and misc fixes

authored by Weijia Wang and committed by GitHub 6d2fe60d 35500f5f

+22 -35
+22 -35
pkgs/applications/audio/cozy/default.nix
··· 1 - { lib, fetchFromGitHub 2 - , ninja 1 + { lib 2 + , python3Packages 3 + , fetchFromGitHub 3 4 , meson 5 + , ninja 4 6 , pkg-config 5 - , wrapGAppsHook 7 + , wrapGAppsHook4 6 8 , appstream-glib 7 9 , desktop-file-utils 8 - , gtk3 9 - , gst_all_1 10 10 , gobject-introspection 11 11 , libadwaita 12 - , libdazzle 13 - , python3Packages 14 - , cairo 15 - , gettext 16 - , gnome 17 - , pantheon 12 + , gst_all_1 18 13 }: 19 14 20 15 python3Packages.buildPythonApplication rec { 21 - 22 - format = "other"; # no setup.py 23 - 24 16 pname = "cozy"; 25 17 version = "1.3.0"; 18 + pyproject = false; # built with meson 26 19 27 20 src = fetchFromGitHub { 28 21 owner = "geigi"; 29 - repo = pname; 22 + repo = "cozy"; 30 23 rev = version; 31 24 hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; 32 25 }; 33 26 34 27 nativeBuildInputs = [ 35 - meson ninja pkg-config 36 - wrapGAppsHook 28 + meson 29 + ninja 30 + pkg-config 31 + wrapGAppsHook4 37 32 appstream-glib 38 33 desktop-file-utils 39 34 gobject-introspection 40 35 ]; 41 36 42 37 buildInputs = [ 43 - gtk3 44 - cairo 45 - gettext 46 - gnome.adwaita-icon-theme 47 38 libadwaita 48 - libdazzle 49 - pantheon.granite 50 39 ] ++ (with gst_all_1; [ 51 40 gstreamer 52 41 gst-plugins-good ··· 56 45 ]); 57 46 58 47 propagatedBuildInputs = with python3Packages; [ 59 - apsw 60 - cairo 61 - dbus-python 62 48 distro 63 - gst-python 64 - magic 65 49 mutagen 66 - packaging 67 50 peewee 68 51 pygobject3 69 52 pytz 70 53 requests 71 54 ]; 72 55 73 - postPatch = '' 74 - patchShebangs meson/*.py 56 + dontWrapGApps = true; 57 + 58 + preFixup = '' 59 + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 75 60 ''; 76 61 77 - postInstall = '' 62 + postFixup = '' 78 63 ln -s $out/bin/com.github.geigi.cozy $out/bin/cozy 79 64 ''; 80 65 81 66 meta = with lib; { 82 - description = "A modern audio book player for Linux using GTK 3"; 67 + description = "A modern audio book player for Linux"; 83 68 homepage = "https://cozy.geigi.de/"; 84 - maintainers = [ maintainers.makefu ]; 85 - license = licenses.gpl3; 69 + maintainers = with maintainers; [ makefu aleksana ]; 70 + license = licenses.gpl3Plus; 71 + mainProgram = "com.github.geigi.cozy"; 72 + platforms = platforms.linux; 86 73 }; 87 74 }