diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 001824c7b36e..511cf9b42094 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, testers, @@ -32,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediascanner2"; - version = "0.117"; + version = "0.118"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/mediascanner2"; - rev = finalAttrs.version; - hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk="; + tag = finalAttrs.version; + hash = "sha256-ZJXJNDZUDor5EJ+rn7pQt7lLzoszZUQM3B+u1gBSMs8="; }; outputs = [ @@ -46,22 +45,6 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - patches = [ - (fetchpatch { - name = "0001-mediascanner2-scannerdaemon-Drop-desktop-and-MEDIASCANNER_RUN-check.patch"; - url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch"; - hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4="; - }) - - # Fix taglib 2.x compat - # Remove when version > 0.117 - (fetchpatch { - name = "0002-mediascanner2-Fix-taglib-2.x-compat.patch"; - url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/0ce744ecb32abb39516d1b9f98d47c3e86690158.patch"; - hash = "sha256-hz/EB83yNoxhxkEcg7ZMezknpKajhH1BNkYD3wrf/eY="; - }) - ]; - postPatch = '' substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" @@ -131,6 +114,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Media scanner service & access library"; homepage = "https://gitlab.com/ubports/development/core/mediascanner2"; + changelog = "https://gitlab.com/ubports/development/core/mediascanner2/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = lib.licenses.gpl3Only; teams = [ lib.teams.lomiri ]; mainProgram = "mediascanner-service-2.0";