diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 91a16490a424..2e0e90e499c4 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - makeWrapper, cmake, pkg-config, gtest, @@ -22,20 +21,19 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.62.1"; + version = "3.64.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-LzDEK17Gh/r3tXGRItQfOeTCD9yGcRzIYMBX77MuwAU="; + hash = "sha256-+DSMqe1TNFCjZrfuhLggymno9OjYONc5ZweREgMsh60="; }; strictDeps = true; nativeBuildInputs = [ cmake pkg-config - makeWrapper ]; buildInputs = [ gtest @@ -58,7 +56,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${ffmpeg}/bin/ffmpeg" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${lib.getExe ffmpeg}" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/docroot" "$out/share/lms/docroot" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/approot" "$out/share/lms/approot" @@ -66,30 +64,6 @@ stdenv.mkDerivation rec { install -Dm444 $out/share/lms/default.service -T $out/lib/systemd/system/lmsd.service ''; - preFixup = '' - wrapProgram $out/bin/lms \ - --prefix LD_LIBRARY_PATH : "${ - lib.strings.makeLibraryPath [ - libSM - libICE - ] - }" - wrapProgram $out/bin/lms-metadata \ - --prefix LD_LIBRARY_PATH : "${ - lib.strings.makeLibraryPath [ - libSM - libICE - ] - }" - wrapProgram $out/bin/lms-recommendation \ - --prefix LD_LIBRARY_PATH : "${ - lib.strings.makeLibraryPath [ - libSM - libICE - ] - }" - ''; - meta = { homepage = "https://github.com/epoupon/lms"; changelog = "https://github.com/epoupon/lms/releases/tag/${src.rev}";