clementine: 1.4.rc2-unstable-2024-05-12 -> 1.4.1 (#378848)

pkgs/applications/audio/clementine/default.nix

@@ -1,45 +1,44 @@
-{ lib
-, mkDerivation
-, fetchFromGitHub
-, boost
-, cmake
-, chromaprint
-, gettext
-, gst_all_1
-, liblastfm
-, qtbase
-, qtx11extras
-, qttools
-, taglib
-, fftw
-, glew
-, qjson
-, sqlite
-, libgpod
-, libplist
-, usbmuxd
-, libmtp
-, libpulseaudio
-, gvfs
-, libcdio
-, pcre
-, projectm
-, protobuf
-, qca-qt5
-, pkg-config
-, sparsehash
-, config
-, makeWrapper
-, gst_plugins
-
-, util-linux
-, libunwind
-, libselinux
-, elfutils
-, libsepol
-, orc
-
-, alsa-lib
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  boost,
+  cmake,
+  chromaprint,
+  gettext,
+  gst_all_1,
+  liblastfm,
+  qtbase,
+  qtx11extras,
+  qttools,
+  taglib,
+  fftw,
+  glew,
+  qjson,
+  sqlite,
+  libgpod,
+  libplist,
+  usbmuxd,
+  libmtp,
+  libpulseaudio,
+  gvfs,
+  libcdio,
+  pcre,
+  projectm,
+  protobuf,
+  qca-qt5,
+  pkg-config,
+  sparsehash,
+  config,
+  wrapQtAppsHook,
+  gst_plugins,
+  util-linux,
+  libunwind,
+  libselinux,
+  elfutils,
+  libsepol,
+  orc,
+  alsa-lib,
 }:
 
 let
@@ -48,22 +47,21 @@ let
   withCD = config.clementine.cd or true;
   withCloud = config.clementine.cloud or true;
 in
-mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "clementine";
-  version = "1.4.rc2-unstable-2024-05-12";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "clementine-player";
     repo = "Clementine";
-    rev = "7607ddcb96e79d373c4b60d9de21f3315719c7d8";
-    sha256 = "sha256-yOG/Je6N8YEsu5AOtxOFgDl3iqb97assYMZYMSwQqqk=";
+    tag = finalAttrs.version;
+    hash = "sha256-ges7PHsv/J0R5dqmKvS5BpYxOgy9YB8hZMXOIe16M6A=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    makeWrapper
-
+    wrapQtAppsHook
     util-linux
     libunwind
     libselinux
@@ -72,37 +70,41 @@ mkDerivation {
     orc
   ];
 
-  buildInputs = [
-    boost
-    chromaprint
-    fftw
-    gettext
-    glew
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gstreamer
-    gvfs
-    liblastfm
-    libpulseaudio
-    pcre
-    projectm
-    protobuf
-    qca-qt5
-    qjson
-    qtbase
-    qtx11extras
-    qttools
-    sqlite
-    taglib
-
-    alsa-lib
-  ]
-  # gst_plugins needed for setup-hooks
-  ++ gst_plugins
-  ++ lib.optionals (withIpod) [ libgpod libplist usbmuxd ]
-  ++ lib.optionals (withMTP) [ libmtp ]
-  ++ lib.optionals (withCD) [ libcdio ]
-  ++ lib.optionals (withCloud) [ sparsehash ];
+  buildInputs =
+    [
+      boost
+      chromaprint
+      fftw
+      gettext
+      glew
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-bad
+      gst_all_1.gstreamer
+      gvfs
+      liblastfm
+      libpulseaudio
+      pcre
+      projectm
+      protobuf
+      qca-qt5
+      qjson
+      qtbase
+      qtx11extras
+      qttools
+      sqlite
+      taglib
+      alsa-lib
+    ]
+    # gst_plugins needed for setup-hooks
+    ++ gst_plugins
+    ++ lib.optionals (withIpod) [
+      libgpod
+      libplist
+      usbmuxd
+    ]
+    ++ lib.optionals (withMTP) [ libmtp ]
+    ++ lib.optionals (withCD) [ libcdio ]
+    ++ lib.optionals (withCloud) [ sparsehash ];
 
   postPatch = ''
     sed -i src/CMakeLists.txt \
@@ -123,16 +125,18 @@ mkDerivation {
     "-DSPOTIFY_BLOB=OFF"
   ];
 
+  dontWrapQtApps = true;
+
   postInstall = ''
-    wrapProgram $out/bin/clementine \
+    wrapQtApp $out/bin/clementine \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.clementine-player.org";
     description = "Multiplatform music player";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ttuegel ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
   };
-}
+})