deepin: don't need prefix qt5integration for all application

+7 -8

pkgs/desktops/deepin/apps/deepin-album/default.nix

··· 8 , dtkwidget 9 , qt5integration 10 , qt5platform-plugins 11 , udisks2-qt5 12 , gio-qt 13 , image-editor ··· 16 , opencv 17 , ffmpeg 18 , ffmpegthumbnailer 19 - , qtbase 20 }: 21 22 stdenv.mkDerivation rec { ··· 35 substituteInPlace libUnionImage/CMakeLists.txt \ 36 --replace "/usr" "$out" 37 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/)" 41 ''; 42 43 nativeBuildInputs = [ ··· 49 50 buildInputs = [ 51 dtkwidget 52 qt5platform-plugins 53 udisks2-qt5 54 gio-qt 55 image-editor ··· 60 ffmpegthumbnailer 61 ]; 62 63 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 64 - qtWrapperArgs = [ 65 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 66 - ]; 67 68 cmakeFlags = [ "-DVERSION=${version}" ]; 69

··· 8 , dtkwidget 9 , qt5integration 10 , qt5platform-plugins 11 + , qtbase 12 + , qtsvg 13 , udisks2-qt5 14 , gio-qt 15 , image-editor ··· 18 , opencv 19 , ffmpeg 20 , ffmpegthumbnailer 21 }: 22 23 stdenv.mkDerivation rec { ··· 36 substituteInPlace libUnionImage/CMakeLists.txt \ 37 --replace "/usr" "$out" 38 substituteInPlace src/CMakeLists.txt \ 39 + --replace "/usr" "$out" 40 ''; 41 42 nativeBuildInputs = [ ··· 48 49 buildInputs = [ 50 dtkwidget 51 + qt5integration 52 qt5platform-plugins 53 + qtbase 54 + qtsvg 55 udisks2-qt5 56 gio-qt 57 image-editor ··· 62 ffmpegthumbnailer 63 ]; 64 65 + strictDeps = true; 66 67 cmakeFlags = [ "-DVERSION=${version}" ]; 68

+7 -5

pkgs/desktops/deepin/apps/deepin-calculator/default.nix

··· 4 , dtkwidget 5 , qt5integration 6 , qt5platform-plugins 7 , dde-qt-dbus-factory 8 , cmake 9 - , qtbase 10 , qttools 11 , pkg-config 12 , wrapQtAppsHook ··· 33 34 buildInputs = [ 35 dtkwidget 36 dde-qt-dbus-factory 37 gtest 38 ]; 39 40 - qtWrapperArgs = [ 41 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 42 - "--prefix QT_QPA_PLATFORM_PLUGIN_PATH : ${qt5platform-plugins}/${qtbase.qtPluginPrefix}" 43 - ]; 44 45 cmakeFlags = [ "-DVERSION=${version}" ]; 46

··· 4 , dtkwidget 5 , qt5integration 6 , qt5platform-plugins 7 + , qtbase 8 + , qtsvg 9 , dde-qt-dbus-factory 10 , cmake 11 , qttools 12 , pkg-config 13 , wrapQtAppsHook ··· 34 35 buildInputs = [ 36 dtkwidget 37 + qt5integration 38 + qt5platform-plugins 39 + qtbase 40 + qtsvg 41 dde-qt-dbus-factory 42 gtest 43 ]; 44 45 + strictDeps = true; 46 47 cmakeFlags = [ "-DVERSION=${version}" ]; 48

+5 -4

pkgs/desktops/deepin/apps/deepin-camera/default.nix

··· 36 37 postPatch = '' 38 substituteInPlace src/CMakeLists.txt \ 39 - --replace "/usr/share/libimagevisualresult/filter_cube" "${image-editor}/share/libimagevisualresult/filter_cube" \ 40 --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" 41 substituteInPlace src/com.deepin.Camera.service \ 42 --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \ 43 - --replace "/usr/share/applications/deepin-camera.desktop" "$out/share/applications/deepin-camera.desktop" 44 ''; 45 46 nativeBuildInputs = [ ··· 52 53 buildInputs = [ 54 dtkwidget 55 qt5platform-plugins 56 image-editor 57 qtbase ··· 70 71 cmakeFlags = [ "-DVERSION=${version}" ]; 72 73 env.NIX_CFLAGS_COMPILE = toString [ 74 "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" 75 "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" 76 ]; 77 78 - # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH 79 qtWrapperArgs = [ 80 - "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" 81 "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" 82 ]; 83

··· 36 37 postPatch = '' 38 substituteInPlace src/CMakeLists.txt \ 39 + --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \ 40 --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0" 41 substituteInPlace src/com.deepin.Camera.service \ 42 --replace "/usr/bin/qdbus" "${lib.getBin qttools}/bin/qdbus" \ 43 + --replace "/usr/share" "$out/share" 44 ''; 45 46 nativeBuildInputs = [ ··· 52 53 buildInputs = [ 54 dtkwidget 55 + qt5integration 56 qt5platform-plugins 57 image-editor 58 qtbase ··· 71 72 cmakeFlags = [ "-DVERSION=${version}" ]; 73 74 + strictDeps = true; 75 + 76 env.NIX_CFLAGS_COMPILE = toString [ 77 "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" 78 "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" 79 ]; 80 81 qtWrapperArgs = [ 82 "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}" 83 ]; 84

+1 -5

pkgs/desktops/deepin/apps/deepin-clone/default.nix

··· 49 buildInputs = [ 50 qtbase 51 dtkwidget 52 qt5platform-plugins 53 libuuid 54 parted ··· 60 ]; 61 62 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 69 meta = with lib; { 70 description = "Disk and partition backup/restore tool";

··· 49 buildInputs = [ 50 qtbase 51 dtkwidget 52 + qt5integration 53 qt5platform-plugins 54 libuuid 55 parted ··· 61 ]; 62 63 strictDeps = true; 64 65 meta = with lib; { 66 description = "Disk and partition backup/restore tool";

+1 -5

pkgs/desktops/deepin/apps/deepin-compressor/default.nix

··· 44 45 buildInputs = [ 46 dtkwidget 47 qt5platform-plugins 48 udisks2-qt5 49 kcodecs ··· 59 ]; 60 61 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 68 meta = with lib; { 69 description = "A fast and lightweight application for creating and extracting archives";

··· 44 45 buildInputs = [ 46 dtkwidget 47 + qt5integration 48 qt5platform-plugins 49 udisks2-qt5 50 kcodecs ··· 60 ]; 61 62 strictDeps = true; 63 64 meta = with lib; { 65 description = "A fast and lightweight application for creating and extracting archives";

+1 -5

pkgs/desktops/deepin/apps/deepin-draw/default.nix

··· 46 47 buildInputs = [ 48 qtbase 49 qtsvg 50 dtkwidget 51 qt5platform-plugins ··· 54 cmakeFlags = [ "-DVERSION=${version}" ]; 55 56 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 63 meta = with lib; { 64 description = "Lightweight drawing tool for users to freely draw and simply edit images";

··· 46 47 buildInputs = [ 48 qtbase 49 + qt5integration 50 qtsvg 51 dtkwidget 52 qt5platform-plugins ··· 55 cmakeFlags = [ "-DVERSION=${version}" ]; 56 57 strictDeps = true; 58 59 meta = with lib; { 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 qtbase 55 qtsvg 56 dtkwidget 57 qt5platform-plugins 58 dde-qt-dbus-factory 59 kcodecs ··· 67 strictDeps = true; 68 69 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 76 meta = with lib; { 77 description = "A desktop text editor that supports common text editing features";

··· 54 qtbase 55 qtsvg 56 dtkwidget 57 + qt5integration 58 qt5platform-plugins 59 dde-qt-dbus-factory 60 kcodecs ··· 68 strictDeps = true; 69 70 cmakeFlags = [ "-DVERSION=${version}" ]; 71 72 meta = with lib; { 73 description = "A desktop text editor that supports common text editing features";

+1 -5

pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix

··· 59 qtbase 60 qtsvg 61 dtkwidget 62 qt5platform-plugins 63 gio-qt 64 udisks2-qt5 ··· 70 strictDeps = true; 71 72 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 79 meta = with lib; { 80 description = "An image viewing tool with fashion interface and smooth performance";

··· 59 qtbase 60 qtsvg 61 dtkwidget 62 + qt5integration 63 qt5platform-plugins 64 gio-qt 65 udisks2-qt5 ··· 71 strictDeps = true; 72 73 cmakeFlags = [ "-DVERSION=${version}" ]; 74 75 meta = with lib; { 76 description = "An image viewing tool with fashion interface and smooth performance";

+7 -6

pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix

··· 73 74 buildInputs = [ 75 dtkwidget 76 qt5platform-plugins 77 qtx11extras 78 qtmultimedia ··· 99 gst-plugins-base 100 ]); 101 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 env.NIX_CFLAGS_COMPILE = toString [ 109 "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" 110 "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ··· 112 113 cmakeFlags = [ 114 "-DVERSION=${version}" 115 ]; 116 117 preFixup = ''

··· 73 74 buildInputs = [ 75 dtkwidget 76 + qt5integration 77 qt5platform-plugins 78 qtx11extras 79 qtmultimedia ··· 100 gst-plugins-base 101 ]); 102 103 env.NIX_CFLAGS_COMPILE = toString [ 104 "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0" 105 "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ··· 107 108 cmakeFlags = [ 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 ]}" 116 ]; 117 118 preFixup = ''

+4 -7

pkgs/desktops/deepin/apps/deepin-music/default.nix

··· 38 39 postPatch = '' 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)" \ 43 --replace "/usr/share" "$out/share" 44 substituteInPlace src/libmusic-plugin/CMakeLists.txt \ 45 --replace "/usr/lib/deepin-aiassistant" "$out/lib/deepin-aiassistant" ··· 56 57 buildInputs = [ 58 dtkwidget 59 qt5platform-plugins 60 dde-qt-dbus-factory 61 udisks2-qt5 ··· 76 gst-plugins-good 77 ]); 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 cmakeFlags = [ 85 "-DVERSION=${version}" 86 ]; 87 88 preFixup = '' 89 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

··· 38 39 postPatch = '' 40 substituteInPlace src/music-player/CMakeLists.txt \ 41 + --replace "/usr/include/vlc" "${libvlc}/include/vlc" \ 42 --replace "/usr/share" "$out/share" 43 substituteInPlace src/libmusic-plugin/CMakeLists.txt \ 44 --replace "/usr/lib/deepin-aiassistant" "$out/lib/deepin-aiassistant" ··· 55 56 buildInputs = [ 57 dtkwidget 58 + qt5integration 59 qt5platform-plugins 60 dde-qt-dbus-factory 61 udisks2-qt5 ··· 76 gst-plugins-good 77 ]); 78 79 cmakeFlags = [ 80 "-DVERSION=${version}" 81 ]; 82 + 83 + strictDeps = true; 84 85 preFixup = '' 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 47 buildInputs = [ 48 dtkwidget 49 qt5platform-plugins 50 dde-qt-dbus-factory 51 qtwebengine ··· 59 60 qmakeFlags = [ 61 "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 ]; 68 69 meta = with lib; {

··· 46 47 buildInputs = [ 48 dtkwidget 49 + qt5integration 50 qt5platform-plugins 51 dde-qt-dbus-factory 52 qtwebengine ··· 60 61 qmakeFlags = [ 62 "DEFINES+=VERSION=${version}" 63 ]; 64 65 meta = with lib; {

+1 -5

pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix

··· 32 buildInputs = [ 33 qtbase 34 dtkwidget 35 qt5platform-plugins 36 ]; 37 38 qmakeFlags = [ 39 "VERSION=${version}" 40 "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 ]; 47 48 meta = with lib; {

··· 32 buildInputs = [ 33 qtbase 34 dtkwidget 35 + qt5integration 36 qt5platform-plugins 37 ]; 38 39 qmakeFlags = [ 40 "VERSION=${version}" 41 "PREFIX=${placeholder "out"}" 42 ]; 43 44 meta = with lib; {

+1 -5

pkgs/desktops/deepin/apps/deepin-terminal/default.nix

··· 53 qtbase 54 qtsvg 55 dtkwidget 56 qt5platform-plugins 57 dde-qt-dbus-factory 58 qtx11extras ··· 63 ]; 64 65 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 72 meta = with lib; { 73 description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features";

··· 53 qtbase 54 qtsvg 55 dtkwidget 56 + qt5integration 57 qt5platform-plugins 58 dde-qt-dbus-factory 59 qtx11extras ··· 64 ]; 65 66 strictDeps = true; 67 68 meta = with lib; { 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 buildInputs = [ 45 qtbase 46 dtkwidget 47 qt5platform-plugins 48 dde-qt-dbus-factory 49 qtmultimedia ··· 61 cmakeFlags = [ "-DVERSION=${version}" ]; 62 63 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 70 preFixup = '' 71 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

··· 44 buildInputs = [ 45 qtbase 46 dtkwidget 47 + qt5integration 48 qt5platform-plugins 49 dde-qt-dbus-factory 50 qtmultimedia ··· 62 cmakeFlags = [ "-DVERSION=${version}" ]; 63 64 env.NIX_CFLAGS_COMPILE = "-I${dde-qt-dbus-factory}/include/libdframeworkdbus-2.0"; 65 66 preFixup = '' 67 qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")