mopidy module: use buildEnv fixes #11706

Changed files
+4 -13
nixos
modules
services
audio
+4 -13
nixos/modules/services/audio/mopidy.nix
···
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 {
···
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;
};
···
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";