summary refs log tree commit diff
path: root/pkgs/desktops/deepin
diff options
context:
space:
mode:
authorrewine <luhongxu@deepin.org>2023-04-19 15:13:55 +0800
committerrewine <luhongxu@deepin.org>2023-04-19 16:35:39 +0800
commit1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3 (patch)
tree0489d6b159b29b1e194bc7a857280acd416b7708 /pkgs/desktops/deepin
parent2fe0919eaf0b81e2db85441bdd220b117344314f (diff)
downloadnixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.tar
nixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.tar.gz
nixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.tar.bz2
nixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.tar.lz
nixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.tar.xz
nixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.tar.zst
nixpkgs-1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3.zip
deepin.dde-file-manager: 6.0.14 -> 6.0.15
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r--pkgs/desktops/deepin/core/dde-file-manager/default.nix12
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index e7d8c67a280..c34e2cc4f90 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -8,7 +8,6 @@
 , dde-qt-dbus-factory
 , docparser
 , dde-dock
-, deepin-movie-reborn
 , cmake
 , qttools
 , qtx11extras
@@ -43,13 +42,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-file-manager";
-  version = "6.0.14";
+  version = "6.0.15";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-88Ddc3986hyFMA0bYCxiupASI+pGLqjb3igOHLA8Q/g=";
+    sha256 = "sha256-tG3Wl1AvwWhHmIIHgexv3mVVrmOwNrwn8k/sD4+WZzk=";
   };
 
   nativeBuildInputs = [
@@ -91,14 +90,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     dtkwidget
     qt5platform-plugins
-    qt5integration
     deepin-pdfium
     util-dfm
     dde-qt-dbus-factory
     glibmm
     docparser
     dde-dock
-    deepin-movie-reborn
     qtx11extras
     qtmultimedia
     kcodecs
@@ -127,6 +124,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
+  qtWrapperArgs = [
+    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
+  ];
+
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';