Merge pull request #60444 from angristan/plex-media-player/fix-desktop-icons

plex-media-player: remove custom desktopItem
This commit is contained in:
worldofpeace 2019-04-30 17:39:02 -04:00 committed by GitHub
commit 8d212a5022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchurl, makeDesktopItem, pkgconfig, cmake, python3
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3
, libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras
, libvdpau, SDL2, mpv, libGL }:
let
@ -50,16 +50,6 @@ in stdenv.mkDerivation rec {
buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras
libvdpau SDL2 mpv libGL ];
desktopItem = makeDesktopItem {
name = "plex-media-player";
exec = "plexmediaplayer";
icon = "plex-media-player";
comment = "View your media";
desktopName = "Plex Media Player";
genericName = "Media Player";
categories = "AudioVideo;Video;Player;TV;";
};
preConfigure = with depSrcs; ''
mkdir -p build/dependencies
ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake
@ -69,12 +59,6 @@ in stdenv.mkDerivation rec {
ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz
'';
postInstall = ''
mkdir -p $out/share/{applications,pixmaps}
cp ${src}/resources/images/icon.png $out/share/pixmaps/plex-media-player.png
cp ${desktopItem}/share/applications/* $out/share/applications
'';
cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ];
meta = with stdenv.lib; {