diff options
| -rw-r--r-- | nixos/modules/services/audio/slimserver.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/slimserver/default.nix | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 7d661dd604081..640403d2c97db 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -51,7 +51,8 @@ in { serviceConfig = { User = "slimserver"; 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"; }; }; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index f79e53b64cf41..c9bf8393afc71 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPerlPackage, fetchurl -, perl, perlPackages, fetchpatch }: +{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper +, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: buildPerlPackage rec { name = "slimserver-${version}"; @@ -16,6 +16,7 @@ buildPerlPackage rec { } ) ]; buildInputs = [ + makeWrapper perl perlPackages.AnyEvent perlPackages.AudioScan @@ -75,17 +76,19 @@ buildPerlPackage rec { preConfigurePhase = ""; - buildPhase = " + buildPhase = '' mv lib tmp mkdir -p lib/perl5/site_perl mv CPAN_used/* lib/perl5/site_perl cp -rf tmp/* lib/perl5/site_perl - "; + ''; doCheck = false; installPhase = '' cp -r . $out + wrapProgram $out/slimserver.pl \ + --prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}" ''; outputs = [ "out" ]; |