Merge pull request #40778 from phile314/slimserver-fix
nixos/slimserver: Fix media scanning & transcoding
This commit is contained in:
commit
a23cf33223
@ -51,7 +51,8 @@ in {
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = "slimserver";
|
User = "slimserver";
|
||||||
PermissionsStartOnly = true;
|
PermissionsStartOnly = true;
|
||||||
ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache";
|
# Issue 40589: Disable broken image/video support (audio still works!)
|
||||||
|
ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, buildPerlPackage, fetchurl
|
{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper
|
||||||
, perl, perlPackages, fetchpatch }:
|
, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
|
||||||
|
|
||||||
buildPerlPackage rec {
|
buildPerlPackage rec {
|
||||||
name = "slimserver-${version}";
|
name = "slimserver-${version}";
|
||||||
@ -16,6 +16,7 @@ buildPerlPackage rec {
|
|||||||
} ) ];
|
} ) ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
makeWrapper
|
||||||
perl
|
perl
|
||||||
perlPackages.AnyEvent
|
perlPackages.AnyEvent
|
||||||
perlPackages.AudioScan
|
perlPackages.AudioScan
|
||||||
@ -75,17 +76,19 @@ buildPerlPackage rec {
|
|||||||
|
|
||||||
preConfigurePhase = "";
|
preConfigurePhase = "";
|
||||||
|
|
||||||
buildPhase = "
|
buildPhase = ''
|
||||||
mv lib tmp
|
mv lib tmp
|
||||||
mkdir -p lib/perl5/site_perl
|
mkdir -p lib/perl5/site_perl
|
||||||
mv CPAN_used/* lib/perl5/site_perl
|
mv CPAN_used/* lib/perl5/site_perl
|
||||||
cp -rf tmp/* lib/perl5/site_perl
|
cp -rf tmp/* lib/perl5/site_perl
|
||||||
";
|
'';
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
cp -r . $out
|
cp -r . $out
|
||||||
|
wrapProgram $out/slimserver.pl \
|
||||||
|
--prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
outputs = [ "out" ];
|
outputs = [ "out" ];
|
||||||
|
Loading…
Reference in New Issue
Block a user