diff options
| author | rewine <luhongxu@deepin.org> | 2024-02-04 15:41:33 +0800 |
|---|---|---|
| committer | rewine <lhongxu@outlook.com> | 2024-03-08 18:33:28 +0800 |
| commit | 7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f (patch) | |
| tree | f87728ec769192a092f5cd345323a6e9b0d4aaa7 /pkgs/desktops/deepin | |
| parent | cf235cdb7cc5668a2a0c515b9c1dc6f8680d1993 (diff) | |
| download | nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.tar nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.tar.gz nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.tar.bz2 nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.tar.lz nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.tar.xz nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.tar.zst nixlib-7141db2ce4f0a7d91fb12102ea38aec0acc8ec5f.zip | |
deepin-compressor: 5.12.23 -> 5.12.24
Diffstat (limited to 'pkgs/desktops/deepin')
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff | 20 | ||||
| -rw-r--r-- | pkgs/desktops/deepin/apps/deepin-compressor/default.nix | 17 |
2 files changed, 33 insertions, 4 deletions
diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff b/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff new file mode 100644 index 000000000000..237d5798ecc8 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff @@ -0,0 +1,20 @@ +diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h +index 49313744..456a5e96 100644 +--- a/src/source/common/ddesktopservicesthread.h ++++ b/src/source/common/ddesktopservicesthread.h +@@ -8,10 +8,14 @@ + + #include <QThread> + ++#include <dtkwidget_global.h> ++#include <dtkgui_global.h> + #include <DDesktopServices> + #include <QDebug> + #include <QFileInfo> ++ + DWIDGET_USE_NAMESPACE ++DGUI_USE_NAMESPACE + + // 文管打开文件目录线程 + class DDesktopServicesThread : public QThread + diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 393c51e4ac64..9be79853b5fe 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -20,20 +20,24 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.23"; + version = "5.12.24"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA="; + hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k="; }; + patches = [ + ./0001-fix-build-on-new-dtk.diff + ]; + postPatch = '' substituteInPlace src/source/common/pluginmanager.cpp \ - --replace "/usr/lib/" "$out/lib/" + --replace-fail "/usr/lib/" "$out/lib/" substituteInPlace src/desktop/deepin-compressor.desktop \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" ''; nativeBuildInputs = [ @@ -61,6 +65,11 @@ stdenv.mkDerivation rec { "-DUSE_TEST=OFF" ]; + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + strictDeps = true; meta = with lib; { |