Unverified Commit 744e61fe authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

plex-desktop: remove version number from name (#345754)

parents 64046f01 4e3b69e1

pkgs/by-name/pl/plex-desktop/package.nix

+70 −65
Original line number Diff line number Diff line 
{ alsa-lib

, autoPatchelfHook

, buildFHSEnv

, dbus

, elfutils

, expat

, extraEnv ? { }

, fetchFromGitLab

, fetchurl

, glib

, glibc

, lib

, libGL

, libapparmor

, libbsd

, libedit

, libffi_3_3

, libgcrypt

, libglvnd

, makeShellWrapper

, sqlite

, squashfsTools

, stdenv

, tcp_wrappers

, udev

, waylandpp

, writeShellScript

, xkeyboard_config

, xorg

, xz

, zstd

{

  alsa-lib,

  autoPatchelfHook,

  buildFHSEnv,

  dbus,

  elfutils,

  expat,

  extraEnv ? { },

  fetchFromGitLab,

  fetchurl,

  glib,

  glibc,

  lib,

  libGL,

  libapparmor,

  libbsd,

  libedit,

  libffi_3_3,

  libgcrypt,

  libglvnd,

  makeShellWrapper,

  sqlite,

  squashfsTools,

  stdenv,

  tcp_wrappers,

  udev,

  waylandpp,

  writeShellScript,

  xkeyboard_config,

  xorg,

  xz,

  zstd,

}:

let

  pname = "plex-desktop";
@@ -104,8 +105,7 @@ let 


    dontWrapQtApps = true;



    installPhase =

      ''

    installPhase = ''

      runHook preInstall



      cp -r . $out
@@ -121,7 +121,7 @@ let 
  };

in

buildFHSEnv {

    name = "${pname}-${version}";

  inherit pname version meta;

  targetPkgs = pkgs: [ xkeyboard_config ];



  extraInstallCommands = ''
@@ -142,10 +142,15 @@ buildFHSEnv { 
    PLEX_USR_PATH=${lib.makeSearchPath "usr/lib/x86_64-linux-gnu" [ plex-desktop ]}



    set -o allexport

      LD_LIBRARY_PATH=${lib.makeLibraryPath [ plex-desktop libglvnd-1_4_0 ]}:$PLEX_USR_PATH

    LD_LIBRARY_PATH=${

      lib.makeLibraryPath [

        plex-desktop

        libglvnd-1_4_0

      ]

    }:$PLEX_USR_PATH

    LIBGL_DRIVERS_PATH=$PLEX_USR_PATH/dri

    ${lib.toShellVars extraEnv}

    exec ${plex-desktop}/Plex.sh

  '';

  passthru.updateScript = ./update.sh;

}

pkgs/by-name/pl/plex-desktop/update.sh

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ sed --regexp-extended \ 
# try to build the updated version

#



export NIXPKGS_ALLOW_UNFREE=1

if ! nix-build -A plex-desktop "$nixpkgs"; then

  echo "The updated plex-desktop failed to build."

  exit 1