diff options
author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:23 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:23 +0000 |
commit | 15c52af2fe8c948b5cbba1717dc38c7ccbd1898e (patch) | |
tree | 066eff3617f67eff6600932bf002e0efb769ce86 /pkgs | |
parent | dd5bcb34c977a6bf90e56517d6682510595f4b4f (diff) | |
download | nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.tar nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.tar.gz nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.tar.bz2 nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.tar.lz nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.tar.xz nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.tar.zst nixpkgs-15c52af2fe8c948b5cbba1717dc38c7ccbd1898e.zip |
plex: move defaults to package file
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/plex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index cce1f5c6ab0..f94d185910f 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, rpmextract, glibc +{ config, stdenv, fetchurl, rpmextract, glibc , dataDir ? "/var/lib/plex" # Plex's data directory must be baked into the package due to symlinks. -, enablePlexPass ? false +, enablePlexPass ? config.plex.enablePlexPass or false }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5471c2374d..a847383e0c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4875,7 +4875,7 @@ in playbar2 = libsForQt5.callPackage ../applications/audio/playbar2 { }; - plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; }; + plex = callPackage ../servers/plex { }; plexpy = callPackage ../servers/plexpy { python = python2; }; |