Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deepin: format via nixfmt-rfc-style #336956

Merged
merged 1 commit into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions pkgs/desktops/deepin/apps/deepin-album/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, qttools
, wrapQtAppsHook
, dtkwidget
, dtkdeclarative
, qt5integration
, qt5platform-plugins
, qtbase
, qtsvg
, udisks2-qt5
, gio-qt
, freeimage
, ffmpeg
, ffmpegthumbnailer
{
stdenv,
lib,
fetchFromGitHub,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
dtkwidget,
dtkdeclarative,
qt5integration,
qt5platform-plugins,
qtbase,
qtsvg,
udisks2-qt5,
gio-qt,
freeimage,
ffmpeg,
ffmpegthumbnailer,
}:

stdenv.mkDerivation rec {
Expand Down
29 changes: 15 additions & 14 deletions pkgs/desktops/deepin/apps/deepin-calculator/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{ stdenv
, lib
, fetchFromGitHub
, dtkwidget
, qt5integration
, qt5platform-plugins
, qtbase
, qtsvg
, dde-qt-dbus-factory
, cmake
, qttools
, pkg-config
, wrapQtAppsHook
, gtest
{
stdenv,
lib,
fetchFromGitHub,
dtkwidget,
qt5integration,
qt5platform-plugins,
qtbase,
qtsvg,
dde-qt-dbus-factory,
cmake,
qttools,
pkg-config,
wrapQtAppsHook,
gtest,
}:

stdenv.mkDerivation rec {
Expand Down
102 changes: 58 additions & 44 deletions pkgs/desktops/deepin/apps/deepin-camera/default.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, qttools
, wrapQtAppsHook
, dtkwidget
, wayland
, dwayland
, qt5integration
, qt5platform-plugins
, image-editor
, qtbase
, qtmultimedia
, ffmpeg
, ffmpegthumbnailer
, libusb1
, libpciaccess
, portaudio
, libv4l
, gst_all_1
, systemd
{
stdenv,
lib,
fetchFromGitHub,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
dtkwidget,
wayland,
dwayland,
qt5integration,
qt5platform-plugins,
image-editor,
qtbase,
qtmultimedia,
ffmpeg,
ffmpegthumbnailer,
libusb1,
libpciaccess,
portaudio,
libv4l,
gst_all_1,
systemd,
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -53,26 +54,28 @@ stdenv.mkDerivation rec {
wrapQtAppsHook
];

buildInputs = [
dtkwidget
wayland
dwayland
qt5integration
qt5platform-plugins
image-editor
qtbase
qtmultimedia
ffmpeg
ffmpegthumbnailer
libusb1
libpciaccess
portaudio
libv4l
] ++ (with gst_all_1 ; [
gstreamer
gst-plugins-base
gst-plugins-good
]);
buildInputs =
[
dtkwidget
wayland
dwayland
qt5integration
qt5platform-plugins
image-editor
qtbase
qtmultimedia
ffmpeg
ffmpegthumbnailer
libusb1
libpciaccess
portaudio
libv4l
]
++ (with gst_all_1; [
gstreamer
gst-plugins-base
gst-plugins-good
]);

cmakeFlags = [ "-DVERSION=${version}" ];

Expand All @@ -84,7 +87,18 @@ stdenv.mkDerivation rec {
];

qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base libusb1 libv4l portaudio systemd ]}"
"--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
ffmpeg
ffmpegthumbnailer
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
libusb1
libv4l
portaudio
systemd
]
}"
];

preFixup = ''
Expand Down
41 changes: 20 additions & 21 deletions pkgs/desktops/deepin/apps/deepin-compressor/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
{ stdenv
, lib
, fetchFromGitHub
, dtkwidget
, qt5integration
, qt5platform-plugins
, udisks2-qt5
, cmake
, qtbase
, qttools
, pkg-config
, kcodecs
, karchive
, wrapQtAppsHook
, minizip
, libzip
, libuuid
, libarchive
{
stdenv,
lib,
fetchFromGitHub,
dtkwidget,
qt5integration,
qt5platform-plugins,
udisks2-qt5,
cmake,
qtbase,
qttools,
pkg-config,
kcodecs,
karchive,
wrapQtAppsHook,
minizip,
libzip,
libuuid,
libarchive,
}:

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -62,9 +63,7 @@ stdenv.mkDerivation rec {
];

# qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
qtWrapperArgs = [
"--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
];
qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" ];

strictDeps = true;

Expand Down
25 changes: 13 additions & 12 deletions pkgs/desktops/deepin/apps/deepin-draw/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, qttools
, pkg-config
, wrapQtAppsHook
, qtbase
, qtsvg
, dtkwidget
, qt5integration
, qt5platform-plugins
{
stdenv,
lib,
fetchFromGitHub,
cmake,
qttools,
pkg-config,
wrapQtAppsHook,
qtbase,
qtsvg,
dtkwidget,
qt5integration,
qt5platform-plugins,
}:

stdenv.mkDerivation rec {
Expand Down
39 changes: 20 additions & 19 deletions pkgs/desktops/deepin/apps/deepin-editor/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
{ stdenv
, lib
, fetchFromGitHub
, cmake
, pkg-config
, qttools
, wrapQtAppsHook
, dtkwidget
, qt5integration
, qt5platform-plugins
, qtbase
, qtsvg
, dde-qt-dbus-factory
, kcodecs
, syntax-highlighting
, libchardet
, libuchardet
, libiconv
, gitUpdater
{
stdenv,
lib,
fetchFromGitHub,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
dtkwidget,
qt5integration,
qt5platform-plugins,
qtbase,
qtsvg,
dde-qt-dbus-factory,
kcodecs,
syntax-highlighting,
libchardet,
libuchardet,
libiconv,
gitUpdater,
}:

stdenv.mkDerivation rec {
Expand Down
39 changes: 20 additions & 19 deletions pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, qttools
, wrapQtAppsHook
, qt5platform-plugins
, qtbase
, dtkwidget
, dtkdeclarative
, deepin-ocr-plugin-manager
, gio-qt
, udisks2-qt5
, image-editor
, libraw
, libexif
, freeimage
{
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
cmake,
pkg-config,
qttools,
wrapQtAppsHook,
qt5platform-plugins,
qtbase,
dtkwidget,
dtkdeclarative,
deepin-ocr-plugin-manager,
gio-qt,
udisks2-qt5,
image-editor,
libraw,
libexif,
freeimage,
}:

stdenv.mkDerivation rec {
Expand Down
Loading