From fabfca721cc10fc0bbdca72de931c2d51ff3b003 Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 7 Apr 2023 14:50:41 +0800 Subject: [PATCH] deepin: don't need prefix qt5integration for all application Seems only in dde-dock/dde-launcher/dde-control-center/dde-session-ui/dde-session-shell qt5integration must be placed before qtsvg in QT_PLUGIN_PATH, otherwise part of the svg cannot be rendered correctly --- .../desktops/deepin/apps/deepin-album/default.nix | 15 +++++++-------- .../deepin/apps/deepin-calculator/default.nix | 12 +++++++----- .../deepin/apps/deepin-camera/default.nix | 9 +++++---- .../desktops/deepin/apps/deepin-clone/default.nix | 6 +----- .../deepin/apps/deepin-compressor/default.nix | 6 +----- pkgs/desktops/deepin/apps/deepin-draw/default.nix | 6 +----- .../deepin/apps/deepin-editor/default.nix | 6 +----- .../deepin/apps/deepin-image-viewer/default.nix | 6 +----- .../deepin/apps/deepin-movie-reborn/default.nix | 13 +++++++------ .../desktops/deepin/apps/deepin-music/default.nix | 11 ++++------- .../deepin/apps/deepin-reader/default.nix | 6 +----- .../apps/deepin-shortcut-viewer/default.nix | 6 +----- .../deepin/apps/deepin-terminal/default.nix | 6 +----- .../deepin/apps/deepin-voice-note/default.nix | 6 +----- 14 files changed, 39 insertions(+), 75 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix index 44cafeb6fb1..49e2919c2fc 100644 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -8,6 +8,8 @@ , dtkwidget , qt5integration , qt5platform-plugins +, qtbase +, qtsvg , udisks2-qt5 , gio-qt , image-editor @@ -16,7 +18,6 @@ , opencv , ffmpeg , ffmpegthumbnailer -, qtbase }: stdenv.mkDerivation rec { @@ -35,9 +36,7 @@ stdenv.mkDerivation rec { substituteInPlace libUnionImage/CMakeLists.txt \ --replace "/usr" "$out" substituteInPlace src/CMakeLists.txt \ - --replace "set(PREFIX /usr)" "set(PREFIX $out)" \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share/deepin-manual/manual-assets/application/)" "share/deepin-manual/manual-assets/application/)" + --replace "/usr" "$out" ''; nativeBuildInputs = [ @@ -49,7 +48,10 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration qt5platform-plugins + qtbase + qtsvg udisks2-qt5 gio-qt image-editor @@ -60,10 +62,7 @@ stdenv.mkDerivation rec { ffmpegthumbnailer ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; + strictDeps = true; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index e565eabe182..af3c39a149a 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -4,9 +4,10 @@ , dtkwidget , qt5integration , qt5platform-plugins +, qtbase +, qtsvg , dde-qt-dbus-factory , cmake -, qtbase , qttools , pkg-config , wrapQtAppsHook @@ -33,14 +34,15 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration + qt5platform-plugins + qtbase + qtsvg dde-qt-dbus-factory gtest ]; - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix QT_QPA_PLATFORM_PLUGIN_PATH : ${qt5platform-plugins}/${qtbase.qtPluginPrefix}" - ]; + strictDeps = true; cmakeFlags = [ "-DVERSION=${version}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index 95e1c9eeb49..4e28ff9a20b 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/CMakeLists.txt \ - --replace "/usr/share/libimagevisualresult/filter_cube" "${image-editor}/share/libimagevisualresult/filter_cube" \ + --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \ --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" substituteInPlace src/com.deepin.Camera.service \ --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \ - --replace "/usr/share/applications/deepin-camera.desktop" "$out/share/applications/deepin-camera.desktop" + --replace "/usr/share" "$out/share" ''; nativeBuildInputs = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration qt5platform-plugins image-editor qtbase @@ -70,14 +71,14 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; + strictDeps = true; + env.NIX_CFLAGS_COMPILE = toString [ "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" ]; diff --git a/pkgs/desktops/deepin/apps/deepin-clone/default.nix b/pkgs/desktops/deepin/apps/deepin-clone/default.nix index 9252224488e..533d2562e62 100644 --- a/pkgs/desktops/deepin/apps/deepin-clone/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-clone/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase dtkwidget + qt5integration qt5platform-plugins libuuid parted @@ -61,11 +62,6 @@ stdenv.mkDerivation rec { strictDeps = true; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "Disk and partition backup/restore tool"; homepage = "https://github.com/linuxdeepin/deepin-clone"; diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 0a7c2e82d62..4aa3612b2ea 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration qt5platform-plugins udisks2-qt5 kcodecs @@ -60,11 +61,6 @@ stdenv.mkDerivation rec { strictDeps = true; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "A fast and lightweight application for creating and extracting archives"; homepage = "https://github.com/linuxdeepin/deepin-compressor"; diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix index c43cc77b510..b8c89e0999b 100644 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase + qt5integration qtsvg dtkwidget qt5platform-plugins @@ -55,11 +56,6 @@ stdenv.mkDerivation rec { strictDeps = true; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "Lightweight drawing tool for users to freely draw and simply edit images"; homepage = "https://github.com/linuxdeepin/deepin-draw"; diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 01a26d58f28..1f26134e9a1 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { qtbase qtsvg dtkwidget + qt5integration qt5platform-plugins dde-qt-dbus-factory kcodecs @@ -68,11 +69,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "A desktop text editor that supports common text editing features"; homepage = "https://github.com/linuxdeepin/deepin-editor"; diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 50ba4584c8b..a19776b2553 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { qtbase qtsvg dtkwidget + qt5integration qt5platform-plugins gio-qt udisks2-qt5 @@ -71,11 +72,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "An image viewing tool with fashion interface and smooth performance"; homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index eaeeae98929..f70cbfbf9f7 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration qt5platform-plugins qtx11extras qtmultimedia @@ -99,12 +100,6 @@ stdenv.mkDerivation rec { gst-plugins-base ]); - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" - ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" @@ -114,6 +109,12 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; + strictDeps = true; + + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" + ]; + preFixup = '' glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index 04b7b46443e..6ac8a91b8e9 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/music-player/CMakeLists.txt \ - --replace "include_directories(/usr/include/vlc)" "include_directories(${libvlc}/include/vlc)" \ - --replace "include_directories(/usr/include/vlc/plugins)" "include_directories(${libvlc}/include/vlc/plugins)" \ + --replace "/usr/include/vlc" "${libvlc}/include/vlc" \ --replace "/usr/share" "$out/share" substituteInPlace src/libmusic-plugin/CMakeLists.txt \ --replace "/usr/lib/deepin-aiassistant" "$out/lib/deepin-aiassistant" @@ -56,6 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration qt5platform-plugins dde-qt-dbus-factory udisks2-qt5 @@ -76,15 +76,12 @@ stdenv.mkDerivation rec { gst-plugins-good ]); - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - cmakeFlags = [ "-DVERSION=${version}" ]; + strictDeps = true; + preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index b72ae4b6035..952a626b9fb 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ dtkwidget + qt5integration qt5platform-plugins dde-qt-dbus-factory qtwebengine @@ -61,11 +62,6 @@ stdenv.mkDerivation rec { "DEFINES+=VERSION=${version}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "A simple memo software with texts and voice recordings"; homepage = "https://github.com/linuxdeepin/deepin-reader"; diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix index dcc8a2e41c8..a9e1f8d7e97 100644 --- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase dtkwidget + qt5integration qt5platform-plugins ]; @@ -40,11 +41,6 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "Deepin Shortcut Viewer"; homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 91373b9598c..a50069b7432 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { qtbase qtsvg dtkwidget + qt5integration qt5platform-plugins dde-qt-dbus-factory qtx11extras @@ -64,11 +65,6 @@ stdenv.mkDerivation rec { strictDeps = true; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - meta = with lib; { description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; homepage = "https://github.com/linuxdeepin/deepin-terminal"; diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix index 992705d451c..599baa24e43 100644 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase dtkwidget + qt5integration qt5platform-plugins dde-qt-dbus-factory qtmultimedia @@ -62,11 +63,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0"; - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH - qtWrapperArgs = [ - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - ]; - preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") '';