diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-05-23 13:03:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 13:03:59 +0200 |
| commit | a23cf3322392c953bc2090bfc2f9ea8d24de57b3 (patch) | |
| tree | 2da538a2a76895010356b1f70861cfcb3d05cd99 | |
| parent | 22d03ba02c8f315e9a488266448f637788b88dc4 (diff) | |
| parent | 308638c0ca1b1ccf64501aa25b8854d212488d3f (diff) | |
| download | nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.tar nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.tar.gz nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.tar.bz2 nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.tar.lz nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.tar.xz nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.tar.zst nixlib-a23cf3322392c953bc2090bfc2f9ea8d24de57b3.zip | |
Merge pull request #40778 from phile314/slimserver-fix
nixos/slimserver: Fix media scanning & transcoding
| -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 7d661dd60408..640403d2c97d 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 f79e53b64cf4..c9bf8393afc7 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" ]; |