From bbe0b5e021129313d82d6b231c46785ad158d6d4 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Sat, 21 Mar 2020 17:22:19 +0100 Subject: [PATCH 1/3] plexamp: init at 3.0.3 Desktop file does not work. --- pkgs/applications/audio/plexamp/default.nix | 39 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/plexamp/default.nix diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix new file mode 100644 index 0000000000000..98cc1065bdbd8 --- /dev/null +++ b/pkgs/applications/audio/plexamp/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchurl, appimageTools, pkgs }: + +let + pname = "plexamp"; + version = "3.0.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; + sha256 = "1rh608kcpdx04p2w2nl94b9p96i37sij5shjhgvak041s64wbpg5"; + name="${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in appimageTools.wrapType2 { + inherit name src; + + multiPkgs = null; # no 32bit needed + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop + install -m 444 -D ${appimageContents}/plexamp.png \ + $out/plexamp.png + substituteInPlace $out/share/applications/plexamp.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A beautiful Plex music player for audiophiles, curators, and hipsters."; + homepage = "https://plexamp.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ killercup ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20daa29db02e..78d17d76b87ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21301,6 +21301,8 @@ in pistol = callPackage ../tools/misc/pistol { }; + plexamp = callPackage ../applications/audio/plexamp { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; From b7e1e4c8ee89b6f67af9b0d5e06c16c1d41aef81 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Tue, 21 Jul 2020 13:52:14 +0200 Subject: [PATCH 2/3] plexamp: 3.0.3 -> 3.1.1 Co-authored-by: Andrew Fontaine --- pkgs/applications/audio/plexamp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 98cc1065bdbd8..baa1f741ca846 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.0.3"; + version = "3.1.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "1rh608kcpdx04p2w2nl94b9p96i37sij5shjhgvak041s64wbpg5"; + sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; name="${pname}-${version}.AppImage"; }; From f80df2f157e0d199de3dc21046620fab999d175e Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Thu, 23 Jul 2020 09:13:40 +0200 Subject: [PATCH 3/3] plexamp: fix icon Co-authored-by: Andrew Fontaine --- pkgs/applications/audio/plexamp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index baa1f741ca846..caa703f59ce48 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -24,7 +24,7 @@ in appimageTools.wrapType2 { ln -s $out/bin/${name} $out/bin/${pname} install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ - $out/plexamp.png + $out/share/icons/hicolor/512x512/apps/plexamp.png substituteInPlace $out/share/applications/plexamp.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' '';