b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #132963 from jonringer/plex-on-aarch64

Browse source 
plex: allow use on non-x86 platforms
This commit is contained in:
Pascal Bach 2022-08-17 20:14:38 +02:00 committed by GitHub
parent fa50d40a72 d48f6467e2
commit 6af1c99422
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
View file

@ -22,8 +22,10 @@
# /lib will link to /lib32
let
is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64;
isMultiBuild = multiPkgs != null && is64Bit;
inherit (stdenv) is64Bit;
# use of glibc_multi is only supported on x86_64-linux
isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux;
isTargetBuild = !isMultiBuild;
# list of packages (usually programs) which are only be installed for the

4
pkgs/top-level/all-packages.nix
View file

@ -9815,7 +9815,9 @@ with pkgs;
inherit (callPackage ../servers/plik { })
plik plikd;
plex = callPackage ../servers/plex { };
plex = callPackage ../servers/plex {
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
};
plexRaw = callPackage ../servers/plex/raw.nix { };
psitransfer = callPackage ../servers/psitransfer { };