diff options
author | Spencer Whitt <me@swhitt.me> | 2015-12-15 22:31:42 -0500 |
---|---|---|
committer | Spencer Whitt <me@swhitt.me> | 2015-12-15 22:38:15 -0500 |
commit | 3bc477e2f2c608dcc623690e378aa588a15b4c5c (patch) | |
tree | 33b020ecb945fa165a3433f86eafd209da6a0198 /nixos/modules/services/audio/mopidy.nix | |
parent | 4446b078fcb75d6cae991350d8c8008c2b92251e (diff) | |
download | nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.tar nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.tar.gz nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.tar.bz2 nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.tar.lz nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.tar.xz nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.tar.zst nixpkgs-3bc477e2f2c608dcc623690e378aa588a15b4c5c.zip |
mopidy module: use buildEnv fixes #11706
Diffstat (limited to 'nixos/modules/services/audio/mopidy.nix')
-rw-r--r-- | nixos/modules/services/audio/mopidy.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index a7a7e8ae688..9981b065f28 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -11,17 +11,8 @@ let mopidyConf = writeText "mopidy.conf" cfg.configuration; - mopidyLauncher = stdenv.mkDerivation { - name = "mopidy-launcher"; - phases = [ "installPhase" ]; - buildInputs = [ makeWrapper python ]; - installPhase = '' - mkdir -p $out/bin - ln -s ${mopidy}/bin/mopidy $out/bin/mopidy - wrapProgram $out/bin/mopidy \ - --prefix PYTHONPATH : \ - "${concatStringsSep ":" (map (p: "$(toPythonPath ${p})") cfg.extensionPackages)}" - ''; + mopidyEnv = python.buildEnv.override { + extraLibs = [ mopidy ] ++ cfg.extensionPackages; }; in { @@ -86,7 +77,7 @@ in { description = "mopidy music player daemon"; preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; serviceConfig = { - ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}"; + ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)}"; User = "mopidy"; PermissionsStartOnly = true; }; @@ -96,7 +87,7 @@ in { description = "mopidy local files scanner"; preStart = "mkdir -p ${cfg.dataDir} && chown -R mopidy:mopidy ${cfg.dataDir}"; serviceConfig = { - ExecStart = "${mopidyLauncher}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan"; + ExecStart = "${mopidyEnv}/bin/mopidy --config ${concatStringsSep ":" ([mopidyConf] ++ cfg.extraConfigFiles)} local scan"; User = "mopidy"; PermissionsStartOnly = true; Type = "oneshot"; |