pyrox.dev / nixpkgs
lol
fork atom

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

rewine fabfca72 d4250d5d

+39 -75
unified split
+7 -8
pkgs/desktops/deepin/apps/deepin-album/default.nix
··· 8 8 , dtkwidget 9 9 , qt5integration 10 10 , qt5platform-plugins 11 + , qtbase 12 + , qtsvg 11 13 , udisks2-qt5 12 14 , gio-qt 13 15 , image-editor ··· 16 18 , opencv 17 19 , ffmpeg 18 20 , ffmpegthumbnailer 19 - , qtbase 20 21 }: 21 22 22 23 stdenv.mkDerivation rec { ··· 35 36 substituteInPlace libUnionImage/CMakeLists.txt \ 36 37 --replace "/usr" "$out" 37 38 substituteInPlace src/CMakeLists.txt \ 38 - --replace "set(PREFIX /usr)" "set(PREFIX $out)" \ 39 - --replace "/usr/bin" "$out/bin" \ 40 - --replace "/usr/share/deepin-manual/manual-assets/application/)" "share/deepin-manual/manual-assets/application/)" 39 + --replace "/usr" "$out" 41 40 ''; 42 41 43 42 nativeBuildInputs = [ ··· 49 48 50 49 buildInputs = [ 51 50 dtkwidget 51 + qt5integration 52 52 qt5platform-plugins 53 + qtbase 54 + qtsvg 53 55 udisks2-qt5 54 56 gio-qt 55 57 image-editor ··· 60 62 ffmpegthumbnailer 61 63 ]; 62 64 63 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 64 - qtWrapperArgs = [ 65 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 66 - ]; 65 + strictDeps = true; 67 66 68 67 cmakeFlags = [ "-DVERSION=${version}" ]; 69 68
+7 -5
pkgs/desktops/deepin/apps/deepin-calculator/default.nix
··· 4 4 , dtkwidget 5 5 , qt5integration 6 6 , qt5platform-plugins 7 + , qtbase 8 + , qtsvg 7 9 , dde-qt-dbus-factory 8 10 , cmake 9 - , qtbase 10 11 , qttools 11 12 , pkg-config 12 13 , wrapQtAppsHook ··· 33 34 34 35 buildInputs = [ 35 36 dtkwidget 37 + qt5integration 38 + qt5platform-plugins 39 + qtbase 40 + qtsvg 36 41 dde-qt-dbus-factory 37 42 gtest 38 43 ]; 39 44 40 - qtWrapperArgs = [ 41 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 42 - "--prefix QT_QPA_PLATFORM_PLUGIN_PATH : ${qt5platform-plugins}/${qtbase.qtPluginPrefix}" 43 - ]; 45 + strictDeps = true; 44 46 45 47 cmakeFlags = [ "-DVERSION=${version}" ]; 46 48
+5 -4
pkgs/desktops/deepin/apps/deepin-camera/default.nix
··· 36 36 37 37 postPatch = '' 38 38 substituteInPlace src/CMakeLists.txt \ 39 - --replace "/usr/share/libimagevisualresult/filter_cube" "${image-editor}/share/libimagevisualresult/filter_cube" \ 39 + --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \ 40 40 --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" 41 41 substituteInPlace src/com.deepin.Camera.service \ 42 42 --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \ 43 - --replace "/usr/share/applications/deepin-camera.desktop" "$out/share/applications/deepin-camera.desktop" 43 + --replace "/usr/share" "$out/share" 44 44 ''; 45 45 46 46 nativeBuildInputs = [ ··· 52 52 53 53 buildInputs = [ 54 54 dtkwidget 55 + qt5integration 55 56 qt5platform-plugins 56 57 image-editor 57 58 qtbase ··· 70 71 71 72 cmakeFlags = [ "-DVERSION=${version}" ]; 72 73 74 + strictDeps = true; 75 + 73 76 env.NIX_CFLAGS_COMPILE = toString [ 74 77 "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" 75 78 "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" 76 79 ]; 77 80 78 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 79 81 qtWrapperArgs = [ 80 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 81 82 "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" 82 83 ]; 83 84
+1 -5
pkgs/desktops/deepin/apps/deepin-clone/default.nix
··· 49 49 buildInputs = [ 50 50 qtbase 51 51 dtkwidget 52 + qt5integration 52 53 qt5platform-plugins 53 54 libuuid 54 55 parted ··· 60 61 ]; 61 62 62 63 strictDeps = true; 63 - 64 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 65 - qtWrapperArgs = [ 66 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 67 - ]; 68 64 69 65 meta = with lib; { 70 66 description = "Disk and partition backup/restore tool";
+1 -5
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
··· 44 44 45 45 buildInputs = [ 46 46 dtkwidget 47 + qt5integration 47 48 qt5platform-plugins 48 49 udisks2-qt5 49 50 kcodecs ··· 59 60 ]; 60 61 61 62 strictDeps = true; 62 - 63 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 64 - qtWrapperArgs = [ 65 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 66 - ]; 67 63 68 64 meta = with lib; { 69 65 description = "A fast and lightweight application for creating and extracting archives";
+1 -5
pkgs/desktops/deepin/apps/deepin-draw/default.nix
··· 46 46 47 47 buildInputs = [ 48 48 qtbase 49 + qt5integration 49 50 qtsvg 50 51 dtkwidget 51 52 qt5platform-plugins ··· 54 55 cmakeFlags = [ "-DVERSION=${version}" ]; 55 56 56 57 strictDeps = true; 57 - 58 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 59 - qtWrapperArgs = [ 60 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 61 - ]; 62 58 63 59 meta = with lib; { 64 60 description = "Lightweight drawing tool for users to freely draw and simply edit images";
+1 -5
pkgs/desktops/deepin/apps/deepin-editor/default.nix
··· 54 54 qtbase 55 55 qtsvg 56 56 dtkwidget 57 + qt5integration 57 58 qt5platform-plugins 58 59 dde-qt-dbus-factory 59 60 kcodecs ··· 67 68 strictDeps = true; 68 69 69 70 cmakeFlags = [ "-DVERSION=${version}" ]; 70 - 71 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 72 - qtWrapperArgs = [ 73 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 74 - ]; 75 71 76 72 meta = with lib; { 77 73 description = "A desktop text editor that supports common text editing features";
+1 -5
pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
··· 59 59 qtbase 60 60 qtsvg 61 61 dtkwidget 62 + qt5integration 62 63 qt5platform-plugins 63 64 gio-qt 64 65 udisks2-qt5 ··· 70 71 strictDeps = true; 71 72 72 73 cmakeFlags = [ "-DVERSION=${version}" ]; 73 - 74 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 75 - qtWrapperArgs = [ 76 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 77 - ]; 78 74 79 75 meta = with lib; { 80 76 description = "An image viewing tool with fashion interface and smooth performance";
+7 -6
pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix
··· 73 73 74 74 buildInputs = [ 75 75 dtkwidget 76 + qt5integration 76 77 qt5platform-plugins 77 78 qtx11extras 78 79 qtmultimedia ··· 99 100 gst-plugins-base 100 101 ]); 101 102 102 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 103 - qtWrapperArgs = [ 104 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 105 - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" 106 - ]; 107 - 108 103 env.NIX_CFLAGS_COMPILE = toString [ 109 104 "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" 110 105 "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ··· 112 107 113 108 cmakeFlags = [ 114 109 "-DVERSION=${version}" 110 + ]; 111 + 112 + strictDeps = true; 113 + 114 + qtWrapperArgs = [ 115 + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" 115 116 ]; 116 117 117 118 preFixup = ''
+4 -7
pkgs/desktops/deepin/apps/deepin-music/default.nix
··· 38 38 39 39 postPatch = '' 40 40 substituteInPlace src/music-player/CMakeLists.txt \ 41 - --replace "include_directories(/usr/include/vlc)" "include_directories(${libvlc}/include/vlc)" \ 42 - --replace "include_directories(/usr/include/vlc/plugins)" "include_directories(${libvlc}/include/vlc/plugins)" \ 41 + --replace "/usr/include/vlc" "${libvlc}/include/vlc" \ 43 42 --replace "/usr/share" "$out/share" 44 43 substituteInPlace src/libmusic-plugin/CMakeLists.txt \ 45 44 --replace "/usr/lib/deepin-aiassistant" "$out/lib/deepin-aiassistant" ··· 56 55 57 56 buildInputs = [ 58 57 dtkwidget 58 + qt5integration 59 59 qt5platform-plugins 60 60 dde-qt-dbus-factory 61 61 udisks2-qt5 ··· 76 76 gst-plugins-good 77 77 ]); 78 78 79 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 80 - qtWrapperArgs = [ 81 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 82 - ]; 83 - 84 79 cmakeFlags = [ 85 80 "-DVERSION=${version}" 86 81 ]; 82 + 83 + strictDeps = true; 87 84 88 85 preFixup = '' 89 86 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+1 -5
pkgs/desktops/deepin/apps/deepin-reader/default.nix
··· 46 46 47 47 buildInputs = [ 48 48 dtkwidget 49 + qt5integration 49 50 qt5platform-plugins 50 51 dde-qt-dbus-factory 51 52 qtwebengine ··· 59 60 60 61 qmakeFlags = [ 61 62 "DEFINES+=VERSION=${version}" 62 - ]; 63 - 64 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 65 - qtWrapperArgs = [ 66 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 67 63 ]; 68 64 69 65 meta = with lib; {
+1 -5
pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix
··· 32 32 buildInputs = [ 33 33 qtbase 34 34 dtkwidget 35 + qt5integration 35 36 qt5platform-plugins 36 37 ]; 37 38 38 39 qmakeFlags = [ 39 40 "VERSION=${version}" 40 41 "PREFIX=${placeholder "out"}" 41 - ]; 42 - 43 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 44 - qtWrapperArgs = [ 45 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 46 42 ]; 47 43 48 44 meta = with lib; {
+1 -5
pkgs/desktops/deepin/apps/deepin-terminal/default.nix
··· 53 53 qtbase 54 54 qtsvg 55 55 dtkwidget 56 + qt5integration 56 57 qt5platform-plugins 57 58 dde-qt-dbus-factory 58 59 qtx11extras ··· 63 64 ]; 64 65 65 66 strictDeps = true; 66 - 67 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 68 - qtWrapperArgs = [ 69 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 70 - ]; 71 67 72 68 meta = with lib; { 73 69 description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features";
+1 -5
pkgs/desktops/deepin/apps/deepin-voice-note/default.nix
··· 44 44 buildInputs = [ 45 45 qtbase 46 46 dtkwidget 47 + qt5integration 47 48 qt5platform-plugins 48 49 dde-qt-dbus-factory 49 50 qtmultimedia ··· 61 62 cmakeFlags = [ "-DVERSION=${version}" ]; 62 63 63 64 env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0"; 64 - 65 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 66 - qtWrapperArgs = [ 67 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 68 - ]; 69 65 70 66 preFixup = '' 71 67 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")