diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-08-24 21:54:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 21:54:17 +0200 |
| commit | 99bf46f5b2a2d727224d7a806cb20b8034f6364b (patch) | |
| tree | 6ab3edde171fc42da6334202ee52536bb1d99f7e /pkgs | |
| parent | 9d9981f847812c740478880f1fd27e1389bcf266 (diff) | |
| parent | 5d2d3ce279605b89553df6d159cb84e113ed709c (diff) | |
| download | nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.tar nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.tar.gz nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.tar.bz2 nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.tar.lz nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.tar.xz nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.tar.zst nixpkgs-99bf46f5b2a2d727224d7a806cb20b8034f6364b.zip | |
Merge pull request #187344 from bachp/plex-bubblewrap
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/plex/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 1855ac1af54..b989959b625 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -1,6 +1,6 @@ # The actual Plex package that we run is a FHS userenv of the "raw" package. { stdenv -, buildFHSUserEnv +, buildFHSUserEnvBubblewrap , writeScript , plexRaw @@ -9,10 +9,16 @@ , dataDir ? "/var/lib/plex" }: -buildFHSUserEnv { +buildFHSUserEnvBubblewrap { name = "plexmediaserver"; + inherit (plexRaw) meta; + # Plex does some magic to detect if it is already running. + # The separate PID namespace somehow breaks this and Plex is thinking it's already + # running and refuses to start. + unsharePid = false; + # This script is run when we start our Plex binary runScript = writeScript "plex-run-script" '' #!${stdenv.shell} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31e45746dac..b7a26c02ae4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9882,9 +9882,8 @@ with pkgs; inherit (callPackage ../servers/plik { }) plik plikd; - plex = callPackage ../servers/plex { - buildFHSUserEnv = buildFHSUserEnvBubblewrap; - }; + plex = callPackage ../servers/plex { }; + plexRaw = callPackage ../servers/plex/raw.nix { }; psitransfer = callPackage ../servers/psitransfer { }; |