diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-30 17:39:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 17:39:02 -0400 |
| commit | 8d212a50227930ce85717c0b2cd907725ac8eef1 (patch) | |
| tree | d9413b127703b225822805cc9cf8ec9f04dd45bb /pkgs/applications/video | |
| parent | 8a929f639132490f5e66e8a78f619d98bb907896 (diff) | |
| parent | 5f1dc029c00a14f4c3ec430476b93eab9fbb8f10 (diff) | |
| download | nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.tar nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.tar.gz nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.tar.bz2 nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.tar.lz nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.tar.xz nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.tar.zst nixpkgs-8d212a50227930ce85717c0b2cd907725ac8eef1.zip | |
Merge pull request #60444 from angristan/plex-media-player/fix-desktop-icons
plex-media-player: remove custom desktopItem
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/plex-media-player/default.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index ceba62b6f60..20684354d09 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -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; { |