diff options
| author | Atemu <atemu.main@gmail.com> | 2023-04-16 13:03:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-16 13:03:36 +0200 |
| commit | 445ef285482ece1e88a43168d79def461b2eb83e (patch) | |
| tree | 860a4c4433e58ff212615933c9b3fc5d6904b2dc /pkgs/servers | |
| parent | 327a9c55a3294d58a28ddc6ca7eac5cd10b55aec (diff) | |
| parent | d978b588655200a5510642760e9dfbbd83242119 (diff) | |
Merge pull request #225748 from Atemu/buildFHSEnvBubblewrap-by-default
buildFHSEnv: use bubblewrap by default
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/onlyoffice-documentserver/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/plex/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index 2c30cb0e18e77..c1204a1a74bc7 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildFHSUserEnvBubblewrap +, buildFHSEnv , corefonts , dejavu_fonts , dpkg @@ -57,7 +57,7 @@ let dontStrip = true; passthru = { - fhs = buildFHSUserEnvBubblewrap { + fhs = buildFHSEnv { name = "onlyoffice-wrapper"; targetPkgs = pkgs: [ diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index b989959b62556..fb05188c8d492 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 -, buildFHSUserEnvBubblewrap +, buildFHSEnv , writeScript , plexRaw @@ -9,7 +9,7 @@ , dataDir ? "/var/lib/plex" }: -buildFHSUserEnvBubblewrap { +buildFHSEnv { name = "plexmediaserver"; inherit (plexRaw) meta; |