From 35ae005d22f2e62beecdf34d4f070a58a4c980ed Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 27 Sep 2023 11:57:20 +0800 Subject: [PATCH] deepin-album: 5.10.9 -> 6.0.2 --- .../deepin/apps/deepin-album/default.nix | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix index 49e2919c2fc0..59fa2c8c7bdf 100644 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -6,39 +6,29 @@ , qttools , wrapQtAppsHook , dtkwidget +, dtkdeclarative , qt5integration , qt5platform-plugins , qtbase , qtsvg , udisks2-qt5 , gio-qt -, image-editor -, glibmm , freeimage -, opencv , ffmpeg , ffmpegthumbnailer }: stdenv.mkDerivation rec { pname = "deepin-album"; - version = "5.10.9"; + version = "6.0.2"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-S/oVRD72dtpnvfGV6YfN5/syrmWA44H/1BbmAe0xjAY="; + hash = "sha256-kRQiH6LvXDpQOgBQiFHM+YQzQFSupOj98aEPbcUumZ8="; }; - # This patch should be removed after upgrading to 6.0.0 - postPatch = '' - substituteInPlace libUnionImage/CMakeLists.txt \ - --replace "/usr" "$out" - substituteInPlace src/CMakeLists.txt \ - --replace "/usr" "$out" - ''; - nativeBuildInputs = [ cmake pkg-config @@ -48,16 +38,14 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + dtkdeclarative qt5integration qt5platform-plugins qtbase qtsvg udisks2-qt5 gio-qt - image-editor - glibmm freeimage - opencv ffmpeg ffmpegthumbnailer ];