From 7b22b8c19e9991694ad0eaeef096804952ccd310 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 24 Aug 2024 14:07:01 +0800 Subject: deepin: format via nixfmt-rfc-style --- pkgs/desktops/deepin/apps/deepin-album/default.nix | 37 ++-- .../deepin/apps/deepin-calculator/default.nix | 29 +-- .../desktops/deepin/apps/deepin-camera/default.nix | 102 +++++----- .../deepin/apps/deepin-compressor/default.nix | 41 ++-- pkgs/desktops/deepin/apps/deepin-draw/default.nix | 25 +-- .../desktops/deepin/apps/deepin-editor/default.nix | 39 ++-- .../deepin/apps/deepin-image-viewer/default.nix | 39 ++-- .../deepin/apps/deepin-movie-reborn/default.nix | 142 +++++++------- pkgs/desktops/deepin/apps/deepin-music/default.nix | 89 +++++---- .../desktops/deepin/apps/deepin-picker/default.nix | 23 +-- .../desktops/deepin/apps/deepin-reader/default.nix | 45 +++-- .../deepin/apps/deepin-screen-recorder/default.nix | 111 ++++++----- .../deepin/apps/deepin-screensaver/default.nix | 30 +-- .../deepin/apps/deepin-shortcut-viewer/default.nix | 24 +-- .../deepin/apps/deepin-system-monitor/default.nix | 57 +++--- .../deepin/apps/deepin-terminal/default.nix | 35 ++-- .../deepin/apps/deepin-voice-note/default.nix | 77 ++++---- .../deepin/artwork/dde-account-faces/default.nix | 12 +- .../artwork/deepin-desktop-theme/default.nix | 26 +-- .../deepin/artwork/deepin-gtk-theme/default.nix | 13 +- .../deepin/artwork/deepin-icon-theme/default.nix | 17 +- .../deepin/artwork/deepin-sound-theme/default.nix | 7 +- .../deepin/artwork/deepin-wallpapers/default.nix | 14 +- .../deepin/core/dde-app-services/default.nix | 23 +-- .../deepin/core/dde-appearance/default.nix | 31 +-- .../core/dde-application-manager/default.nix | 15 +- pkgs/desktops/deepin/core/dde-calendar/default.nix | 38 ++-- .../desktops/deepin/core/dde-clipboard/default.nix | 35 ++-- .../deepin/core/dde-control-center/default.nix | 50 ++--- pkgs/desktops/deepin/core/dde-dock/default.nix | 48 ++--- .../deepin/core/dde-file-manager/default.nix | 92 +++++---- .../deepin/core/dde-grand-search/default.nix | 37 ++-- .../deepin/core/dde-gsettings-schemas/default.nix | 29 +-- .../desktops/deepin/core/dde-launchpad/default.nix | 49 ++--- .../deepin/core/dde-network-core/default.nix | 37 ++-- .../deepin/core/dde-polkit-agent/default.nix | 31 ++- .../deepin/core/dde-session-shell/default.nix | 66 ++++--- .../deepin/core/dde-session-ui/default.nix | 39 ++-- pkgs/desktops/deepin/core/dde-session/default.nix | 27 +-- pkgs/desktops/deepin/core/dde-shell/default.nix | 51 +++-- pkgs/desktops/deepin/core/dde-widgets/default.nix | 25 +-- pkgs/desktops/deepin/core/deepin-kwin/default.nix | 82 ++++---- .../deepin/core/deepin-service-manager/default.nix | 13 +- .../deepin/core/dpa-ext-gnomekeyring/default.nix | 23 +-- pkgs/desktops/deepin/default.nix | 210 +++++++++++---------- .../desktops/deepin/go-package/dde-api/default.nix | 35 ++-- .../deepin/go-package/dde-daemon/default.nix | 82 ++++---- .../go-package/deepin-desktop-schemas/default.nix | 11 +- .../deepin/go-package/deepin-pw-check/default.nix | 29 ++- .../deepin/go-package/startdde/default.nix | 33 ++-- .../deepin/library/dde-qt-dbus-factory/default.nix | 17 +- .../library/deepin-ocr-plugin-manager/default.nix | 23 +-- .../deepin/library/deepin-pdfium/default.nix | 17 +- .../library/deepin-wayland-protocols/default.nix | 11 +- .../desktops/deepin/library/disomaster/default.nix | 17 +- pkgs/desktops/deepin/library/docparser/default.nix | 17 +- pkgs/desktops/deepin/library/dtk6core/default.nix | 34 ++-- .../deepin/library/dtk6declarative/default.nix | 39 ++-- pkgs/desktops/deepin/library/dtk6gui/default.nix | 25 ++- .../deepin/library/dtk6systemsettings/default.nix | 25 ++- .../desktops/deepin/library/dtk6widget/default.nix | 45 +++-- pkgs/desktops/deepin/library/dtkcommon/default.nix | 13 +- pkgs/desktops/deepin/library/dtkcore/default.nix | 36 ++-- .../deepin/library/dtkdeclarative/default.nix | 23 ++- pkgs/desktops/deepin/library/dtkgui/default.nix | 27 +-- pkgs/desktops/deepin/library/dtkwidget/default.nix | 31 +-- pkgs/desktops/deepin/library/dwayland/default.nix | 25 +-- pkgs/desktops/deepin/library/gio-qt/default.nix | 38 ++-- .../deepin/library/image-editor/default.nix | 38 ++-- .../deepin/library/qt5integration/default.nix | 23 +-- .../deepin/library/qt5platform-plugins/default.nix | 27 +-- .../deepin/library/qt6integration/default.nix | 17 +- .../deepin/library/qt6platform-plugins/default.nix | 21 ++- .../deepin/library/udisks2-qt5/default.nix | 21 ++- pkgs/desktops/deepin/library/util-dfm/default.nix | 23 +-- .../deepin/misc/deepin-desktop-base/default.nix | 14 +- pkgs/desktops/deepin/misc/deepin-turbo/default.nix | 19 +- .../deepin/tools/dde-device-formatter/default.nix | 31 ++- .../deepin/tools/deepin-anything/default.nix | 23 +-- .../deepin/tools/deepin-gettext-tools/default.nix | 17 +- 80 files changed, 1583 insertions(+), 1429 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/deepin/apps/deepin-album/default.nix b/pkgs/desktops/deepin/apps/deepin-album/default.nix index 4cca3377492c7..ed1edae06321b 100644 --- a/pkgs/desktops/deepin/apps/deepin-album/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-album/default.nix @@ -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 { diff --git a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix index 6565e99401ce8..631e424078759 100644 --- a/pkgs/desktops/deepin/apps/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -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 { diff --git a/pkgs/desktops/deepin/apps/deepin-camera/default.nix b/pkgs/desktops/deepin/apps/deepin-camera/default.nix index d62e8a6c91f14..c1f3e53b5be24 100644 --- a/pkgs/desktops/deepin/apps/deepin-camera/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-camera/default.nix @@ -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 { @@ -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}" ]; @@ -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 = '' diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 07a92200cb21a..29c538406c250 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -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 { @@ -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; diff --git a/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/pkgs/desktops/deepin/apps/deepin-draw/default.nix index 35de0414b47e4..eaa6ee1a1cfe0 100644 --- a/pkgs/desktops/deepin/apps/deepin-draw/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-draw/default.nix @@ -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 { diff --git a/pkgs/desktops/deepin/apps/deepin-editor/default.nix b/pkgs/desktops/deepin/apps/deepin-editor/default.nix index 7987c814b7aa8..a3b1a15b66970 100644 --- a/pkgs/desktops/deepin/apps/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-editor/default.nix @@ -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 { diff --git a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix index 8cb889b05f448..31ce23124cd2f 100644 --- a/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-image-viewer/default.nix @@ -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 { diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index 494db983c2c14..cb87e366304ea 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -1,33 +1,34 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, qttools -, qtx11extras -, qtmultimedia -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtmpris -, qtdbusextended -, gsettings-qt -, elfutils -, ffmpeg -, ffmpegthumbnailer -, mpv -, xorg -, pcre -, libdvdread -, libdvdnav -, libunwind -, libva -, zstd -, glib -, gst_all_1 -, gtest -, libpulseaudio +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qttools, + qtx11extras, + qtmultimedia, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtmpris, + qtdbusextended, + gsettings-qt, + elfutils, + ffmpeg, + ffmpegthumbnailer, + mpv, + xorg, + pcre, + libdvdread, + libdvdnav, + libunwind, + libva, + zstd, + glib, + gst_all_1, + gtest, + libpulseaudio, }: stdenv.mkDerivation rec { @@ -41,11 +42,12 @@ stdenv.mkDerivation rec { hash = "sha256-1UbrNufetedla8TMFPze1hP/R2cZN7SEYEtrK4/5/RQ="; }; - patches = [ - ./dont_use_libPath.diff - ]; + patches = [ ./dont_use_libPath.diff ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ cmake @@ -54,34 +56,36 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - qt5integration - qt5platform-plugins - qtx11extras - qtmultimedia - qtdbusextended - qtmpris - gsettings-qt - elfutils - ffmpeg - ffmpegthumbnailer - xorg.libXtst - xorg.libXdmcp - xorg.xcbproto - pcre.dev - libdvdread - libdvdnav - libunwind - libva - zstd - mpv - gtest - libpulseaudio - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - ]); + buildInputs = + [ + dtkwidget + qt5integration + qt5platform-plugins + qtx11extras + qtmultimedia + qtdbusextended + qtmpris + gsettings-qt + elfutils + ffmpeg + ffmpegthumbnailer + xorg.libXtst + xorg.libXdmcp + xorg.xcbproto + pcre.dev + libdvdread + libdvdnav + libunwind + libva + zstd + mpv + gtest + libpulseaudio + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + ]); propagatedBuildInputs = [ qtmultimedia @@ -94,14 +98,20 @@ stdenv.mkDerivation rec { "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0" ]; - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; strictDeps = true; qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ mpv ffmpeg ffmpegthumbnailer gst_all_1.gstreamer gst_all_1.gst-plugins-base ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + mpv + ffmpeg + ffmpegthumbnailer + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + ] + }" ]; preFixup = '' diff --git a/pkgs/desktops/deepin/apps/deepin-music/default.nix b/pkgs/desktops/deepin/apps/deepin-music/default.nix index e5cbca387efbe..41555483ccd0e 100644 --- a/pkgs/desktops/deepin/apps/deepin-music/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-music/default.nix @@ -1,24 +1,25 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, dtkdeclarative -, qt5integration -, qt5platform-plugins -, udisks2-qt5 -, qtmpris -, qtmultimedia -, kcodecs -, ffmpeg -, libvlc -, taglib -, SDL2 -, qtbase -, gst_all_1 +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + dtkdeclarative, + qt5integration, + qt5platform-plugins, + udisks2-qt5, + qtmpris, + qtmultimedia, + kcodecs, + ffmpeg, + libvlc, + taglib, + SDL2, + qtbase, + gst_all_1, }: stdenv.mkDerivation rec { @@ -32,9 +33,7 @@ stdenv.mkDerivation rec { hash = "sha256-MLfkSO8ru8MKiwgiQ0mPO3zGlnIeSHPc0Op5jjzJ6PE="; }; - patches = [ - "${src}/patches/fix-library-path.patch" - ]; + patches = [ "${src}/patches/fix-library-path.patch" ]; nativeBuildInputs = [ cmake @@ -43,28 +42,28 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - dtkdeclarative - qt5integration - qt5platform-plugins - udisks2-qt5 - qtmpris - qtmultimedia - kcodecs - ffmpeg - libvlc - taglib - SDL2 - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + dtkwidget + dtkdeclarative + qt5integration + qt5platform-plugins + udisks2-qt5 + qtmpris + qtmultimedia + kcodecs + ffmpeg + libvlc + taglib + SDL2 + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; env.NIX_CFLAGS_COMPILE = toString [ "-I${libvlc}/include/vlc/plugins" diff --git a/pkgs/desktops/deepin/apps/deepin-picker/default.nix b/pkgs/desktops/deepin/apps/deepin-picker/default.nix index 5ee86bf7b8e3f..f74e2ae3513de 100644 --- a/pkgs/desktops/deepin/apps/deepin-picker/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-picker/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, qttools -, pkg-config -, wrapQtAppsHook -, dtkwidget -, qtbase -, qtsvg -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + qttools, + pkg-config, + wrapQtAppsHook, + dtkwidget, + qtbase, + qtsvg, + xorg, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index d730114af4fcf..2bae6bf3e7789 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -1,23 +1,24 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, qtwebengine -, karchive -, poppler -, libchardet -, libspectre -, openjpeg -, djvulibre -, qtbase -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + qtwebengine, + karchive, + poppler, + libchardet, + libspectre, + openjpeg, + djvulibre, + qtbase, + gtest, }: stdenv.mkDerivation rec { @@ -63,9 +64,7 @@ stdenv.mkDerivation rec { gtest ]; - qmakeFlags = [ - "DEFINES+=VERSION=${version}" - ]; + qmakeFlags = [ "DEFINES+=VERSION=${version}" ]; meta = with lib; { description = "Simple memo software with texts and voice recordings"; diff --git a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix index 3b775fb8bc642..6c2fffe630323 100644 --- a/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix @@ -1,27 +1,28 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, dde-qt-dbus-factory -, qtbase -, qtmultimedia -, qtx11extras -, image-editor -, gsettings-qt -, xorg -, libusb1 -, libv4l -, ffmpeg -, ffmpegthumbnailer -, portaudio -, kwayland -, udev -, gst_all_1 +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + dde-qt-dbus-factory, + qtbase, + qtmultimedia, + qtx11extras, + image-editor, + gsettings-qt, + xorg, + libusb1, + libv4l, + ffmpeg, + ffmpegthumbnailer, + portaudio, + kwayland, + udev, + gst_all_1, }: stdenv.mkDerivation rec { @@ -35,9 +36,7 @@ stdenv.mkDerivation rec { hash = "sha256-nE+axTUxWCcgrxQ5y2cjkVswW2rwv/We0m7XgB4shko="; }; - patches = [ - ./dont_use_libPath.diff - ]; + patches = [ ./dont_use_libPath.diff ]; # disable dock plugins, it's part of dde-shell now postPatch = '' @@ -57,34 +56,44 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - dde-qt-dbus-factory - qtbase - qtmultimedia - qtx11extras - image-editor - gsettings-qt - xorg.libXdmcp - xorg.libXtst - xorg.libXcursor - libusb1 - libv4l - ffmpeg - ffmpegthumbnailer - portaudio - kwayland - udev - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + dtkwidget + dde-qt-dbus-factory + qtbase + qtmultimedia + qtx11extras + image-editor + gsettings-qt + xorg.libXdmcp + xorg.libXtst + xorg.libXcursor + libusb1 + libv4l + ffmpeg + ffmpegthumbnailer + portaudio + kwayland + udev + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH qtWrapperArgs = [ "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev gst_all_1.gstreamer libv4l ffmpeg ffmpegthumbnailer ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + udev + gst_all_1.gstreamer + libv4l + ffmpeg + ffmpegthumbnailer + ] + }" ]; preFixup = '' diff --git a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix index 5de3bb6f845e5..6324cc4d7dd92 100644 --- a/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-screensaver/default.nix @@ -1,17 +1,18 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, qttools -, pkg-config -, wrapQtAppsHook -, qtbase -, qtx11extras -, qtdeclarative -, dtkwidget -, dde-qt-dbus-factory -, xorg -, xscreensaver +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + qttools, + pkg-config, + wrapQtAppsHook, + qtbase, + qtx11extras, + qtdeclarative, + dtkwidget, + dde-qt-dbus-factory, + xorg, + xscreensaver, }: stdenv.mkDerivation rec { @@ -67,4 +68,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix index 2a1f4cab4aa83..4542558e399e9 100644 --- a/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-shortcut-viewer/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, qmake -, qtbase -, qttools -, pkg-config -, wrapQtAppsHook +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + qmake, + qtbase, + qttools, + pkg-config, + wrapQtAppsHook, }: stdenv.mkDerivation rec { @@ -50,4 +51,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix index 5653aa9e147e4..f37fb2dc6c259 100644 --- a/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-system-monitor/default.nix @@ -1,29 +1,30 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, deepin-gettext-tools -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtbase -, qtsvg -, qtx11extras -, dde-qt-dbus-factory -, dde-dock -, gsettings-qt -, polkit-qt -, procps -, libpcap -, libnl -, util-linux -, systemd -, polkit -, wayland -, dwayland +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + deepin-gettext-tools, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtbase, + qtsvg, + qtx11extras, + dde-qt-dbus-factory, + dde-dock, + gsettings-qt, + polkit-qt, + procps, + libpcap, + libnl, + util-linux, + systemd, + polkit, + wayland, + dwayland, }: stdenv.mkDerivation rec { @@ -82,9 +83,7 @@ stdenv.mkDerivation rec { dwayland ]; - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; strictDeps = true; diff --git a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix index 6a0e7b0ccb6e6..1d5e0d390d9da 100644 --- a/pkgs/desktops/deepin/apps/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -1,20 +1,21 @@ -{ stdenv -, lib -, fetchFromGitHub -, nixosTests -, dtkwidget -, qt5integration -, qt5platform-plugins -, cmake -, qtbase -, qtsvg -, qttools -, qtx11extras -, pkg-config -, wrapQtAppsHook -, libsecret -, chrpath -, lxqt +{ + stdenv, + lib, + fetchFromGitHub, + nixosTests, + dtkwidget, + qt5integration, + qt5platform-plugins, + cmake, + qtbase, + qtsvg, + qttools, + qtx11extras, + pkg-config, + wrapQtAppsHook, + libsecret, + chrpath, + lxqt, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix index 766d4962fc708..d948a6f4d2fd1 100644 --- a/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-voice-note/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, qtsvg -, dde-qt-dbus-factory -, qtmultimedia -, qtwebengine -, libvlc -, gst_all_1 -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + qtsvg, + dde-qt-dbus-factory, + qtmultimedia, + qtwebengine, + libvlc, + gst_all_1, + gtest, }: stdenv.mkDerivation rec { @@ -29,9 +30,7 @@ stdenv.mkDerivation rec { hash = "sha256-k6LFMs2/OQQyeGI5WXBGWkAAY4GeP8LaA8hTXFwbaCM="; }; - patches = [ - ./use_v23_dbus_interface.diff - ]; + patches = [ ./use_v23_dbus_interface.diff ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -47,30 +46,30 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - qtbase - qtsvg - dtkwidget - qt5platform-plugins - dde-qt-dbus-factory - qtmultimedia - qtwebengine - libvlc - gtest - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + qtbase + qtsvg + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtmultimedia + qtwebengine + libvlc + gtest + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); strictDeps = true; cmakeFlags = [ "-DVERSION=${version}" ]; # 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}" ]; preFixup = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix index b635b721a0123..33dffba91c959 100644 --- a/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix +++ b/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix @@ -1,6 +1,7 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub +{ + stdenvNoCC, + lib, + fetchFromGitHub, }: stdenvNoCC.mkDerivation rec { @@ -19,7 +20,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Account faces of deepin desktop environment"; homepage = "https://github.com/linuxdeepin/dde-account-faces"; - license = with licenses; [ gpl3Plus cc0 ]; + license = with licenses; [ + gpl3Plus + cc0 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix index 32109c4b6c0af..fbbd907034642 100644 --- a/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-desktop-theme/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, gtk3 -, xcursorgen -, papirus-icon-theme -, breeze-icons -, hicolor-icon-theme -, deepin-icon-theme +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + gtk3, + xcursorgen, + papirus-icon-theme, + breeze-icons, + hicolor-icon-theme, + deepin-icon-theme, }: stdenv.mkDerivation rec { @@ -47,7 +48,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Provides a variety of well-designed theme resources"; homepage = "https://github.com/linuxdeepin/deepin-desktop-theme"; - license = with licenses; [ gpl3Plus cc-by-sa-40 ]; + license = with licenses; [ + gpl3Plus + cc-by-sa-40 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix index 80ec8c50449d4..6405a95cd55d0 100644 --- a/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix @@ -1,7 +1,8 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, gtk-engine-murrine +{ + stdenvNoCC, + lib, + fetchFromGitHub, + gtk-engine-murrine, }: stdenvNoCC.mkDerivation rec { @@ -15,9 +16,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-2B2BtbPeg3cEbnEIgdGFzy8MjCMWlbP/Sq4jzG5cjmc="; }; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix index 0795b194ab3ee..2ff8cb984351a 100644 --- a/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -1,9 +1,10 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, gtk3 -, xcursorgen -, papirus-icon-theme +{ + stdenvNoCC, + lib, + fetchFromGitHub, + gtk3, + xcursorgen, + papirus-icon-theme, }: stdenvNoCC.mkDerivation rec { @@ -24,9 +25,7 @@ stdenvNoCC.mkDerivation rec { xcursorgen ]; - propagatedBuildInputs = [ - papirus-icon-theme - ]; + propagatedBuildInputs = [ papirus-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix index f779a77c3234d..79e2f15716b16 100644 --- a/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix @@ -1,6 +1,7 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub +{ + stdenvNoCC, + lib, + fetchFromGitHub, }: stdenvNoCC.mkDerivation rec { diff --git a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix index c0aa13f16a6d2..c472244adf2a8 100644 --- a/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/artwork/deepin-wallpapers/default.nix @@ -1,7 +1,8 @@ -{ stdenv -, lib -, fetchFromGitHub -, dde-api +{ + stdenv, + lib, + fetchFromGitHub, + dde-api, }: stdenv.mkDerivation rec { @@ -36,7 +37,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "deepin-wallpapers provides wallpapers of dde"; homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = with licenses; [ gpl3Plus cc-by-sa-30 ]; + license = with licenses; [ + gpl3Plus + cc-by-sa-30 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/core/dde-app-services/default.nix b/pkgs/desktops/deepin/core/dde-app-services/default.nix index 64713d08b11f7..fe8198ad6b9f2 100644 --- a/pkgs/desktops/deepin/core/dde-app-services/default.nix +++ b/pkgs/desktops/deepin/core/dde-app-services/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, cmake -, wrapQtAppsHook -, qtbase -, qttools -, doxygen +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + cmake, + wrapQtAppsHook, + qtbase, + qttools, + doxygen, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-appearance/default.nix b/pkgs/desktops/deepin/core/dde-appearance/default.nix index 13a6ee3e7cf2c..89315e2bd8a35 100644 --- a/pkgs/desktops/deepin/core/dde-appearance/default.nix +++ b/pkgs/desktops/deepin/core/dde-appearance/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, qtbase -, dtkgui -, gsettings-qt -, gtk3 -, kconfig -, kwindowsystem -, kglobalaccel -, xorg -, iconv +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qtbase, + dtkgui, + gsettings-qt, + gtk3, + kconfig, + kwindowsystem, + kglobalaccel, + xorg, + iconv, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-application-manager/default.nix b/pkgs/desktops/deepin/core/dde-application-manager/default.nix index eaea04961e1fe..73b412d7e6dad 100644 --- a/pkgs/desktops/deepin/core/dde-application-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-application-manager/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qt6Packages -, dtk6core +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qt6Packages, + dtk6core, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-calendar/default.nix b/pkgs/desktops/deepin/core/dde-calendar/default.nix index 88235bbf08c52..6eecb85c1b609 100644 --- a/pkgs/desktops/deepin/core/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/core/dde-calendar/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, qtbase -, qtsvg -, libical -, sqlite -, runtimeShell +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + qtbase, + qtsvg, + libical, + sqlite, + runtimeShell, }: stdenv.mkDerivation rec { @@ -27,9 +28,7 @@ stdenv.mkDerivation rec { hash = "sha256-08xkdiP0/haHY3jdHSoA1zXRxMi2t+qxLxbcRc7EO6Q="; }; - patches = [ - ./fix-wrapped-name-not-in-whitelist.diff - ]; + patches = [ ./fix-wrapped-name-not-in-whitelist.diff ]; postPatch = '' for file in $(grep -rl "/bin/bash"); do @@ -68,4 +67,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/core/dde-clipboard/default.nix b/pkgs/desktops/deepin/core/dde-clipboard/default.nix index 85eb716529637..7aecb9f3ba105 100644 --- a/pkgs/desktops/deepin/core/dde-clipboard/default.nix +++ b/pkgs/desktops/deepin/core/dde-clipboard/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, gio-qt -, cmake -, extra-cmake-modules -, qttools -, wayland -, kwayland -, dwayland -, pkg-config -, wrapQtAppsHook -, glibmm -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + gio-qt, + cmake, + extra-cmake-modules, + qttools, + wayland, + kwayland, + dwayland, + pkg-config, + wrapQtAppsHook, + glibmm, + gtest, }: stdenv.mkDerivation rec { @@ -44,9 +45,7 @@ stdenv.mkDerivation rec { gtest ]; - cmakeFlags = [ - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; + cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; meta = with lib; { description = "DDE optional clipboard manager componment"; diff --git a/pkgs/desktops/deepin/core/dde-control-center/default.nix b/pkgs/desktops/deepin/core/dde-control-center/default.nix index 64bc81d8b9ad5..fc8e0bfd075f9 100644 --- a/pkgs/desktops/deepin/core/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/core/dde-control-center/default.nix @@ -1,25 +1,26 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, doxygen -, wrapQtAppsHook -, wrapGAppsHook3 -, dtkwidget -, qt5integration -, qt5platform-plugins -, deepin-pw-check -, qtbase -, qtx11extras -, qtmultimedia -, polkit-qt -, libxcrypt -, librsvg -, gtest -, runtimeShell -, dbus +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + doxygen, + wrapQtAppsHook, + wrapGAppsHook3, + dtkwidget, + qt5integration, + qt5platform-plugins, + deepin-pw-check, + qtbase, + qtx11extras, + qtmultimedia, + polkit-qt, + libxcrypt, + librsvg, + gtest, + runtimeShell, + dbus, }: stdenv.mkDerivation rec { @@ -89,7 +90,10 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = with lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix index 61ef89a9a4dcc..db3a4a052334c 100644 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules -, qttools -, pkg-config -, wrapQtAppsHook -, wrapGAppsHook3 -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, dwayland -, qtx11extras -, gsettings-qt -, libdbusmenu -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + qttools, + pkg-config, + wrapQtAppsHook, + wrapGAppsHook3, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + dwayland, + qtx11extras, + gsettings-qt, + libdbusmenu, + xorg, }: stdenv.mkDerivation rec { @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { for file in $(grep -rl "/usr/lib/deepin-daemon"); do substituteInPlace $file --replace "/usr/lib/deepin-daemon" "/run/current-system/sw/lib/deepin-daemon" done - ''; + ''; nativeBuildInputs = [ cmake @@ -65,14 +66,15 @@ stdenv.mkDerivation rec { xorg.libXres ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; cmakeFlags = [ "-DVERSION=${version}" ]; # 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}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix index cfc610420957c..7e77c7f083ffe 100644 --- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix @@ -1,44 +1,45 @@ -{ stdenv -, lib -, fetchFromGitHub -, runtimeShell -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, docparser -, dde-dock -, cmake -, qttools -, qtx11extras -, qtmultimedia -, kcodecs -, pkg-config -, ffmpegthumbnailer -, libsecret -, libmediainfo -, mediainfo -, libzen -, poppler -, polkit-qt -, polkit -, wrapQtAppsHook -, wrapGAppsHook3 -, lucenepp -, boost -, taglib -, cryptsetup -, glib -, qtbase -, util-dfm -, deepin-pdfium -, libuuid -, libselinux -, glibmm -, pcre -, udisks2 -, libisoburn -, gsettings-qt +{ + stdenv, + lib, + fetchFromGitHub, + runtimeShell, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + docparser, + dde-dock, + cmake, + qttools, + qtx11extras, + qtmultimedia, + kcodecs, + pkg-config, + ffmpegthumbnailer, + libsecret, + libmediainfo, + mediainfo, + libzen, + poppler, + polkit-qt, + polkit, + wrapQtAppsHook, + wrapGAppsHook3, + lucenepp, + boost, + taglib, + cryptsetup, + glib, + qtbase, + util-dfm, + deepin-pdfium, + libuuid, + libselinux, + glibmm, + pcre, + udisks2, + libisoburn, + gsettings-qt, }: stdenv.mkDerivation rec { @@ -61,9 +62,7 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - patches = [ - ./patch_check_v23_interface.diff - ]; + patches = [ ./patch_check_v23_interface.diff ]; postPatch = '' patchShebangs . @@ -132,9 +131,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # 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}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") @@ -148,4 +145,3 @@ stdenv.mkDerivation rec { maintainers = teams.deepin.members; }; } - diff --git a/pkgs/desktops/deepin/core/dde-grand-search/default.nix b/pkgs/desktops/deepin/core/dde-grand-search/default.nix index 8b653004f27a3..2d07a478fec35 100644 --- a/pkgs/desktops/deepin/core/dde-grand-search/default.nix +++ b/pkgs/desktops/deepin/core/dde-grand-search/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, dtkwidget -, dde-qt-dbus-factory -, dde-dock -, deepin-pdfium -, qt5integration -, qt5platform-plugins -, taglib -, ffmpeg -, ffmpegthumbnailer -, pcre -, dbus +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + dtkwidget, + dde-qt-dbus-factory, + dde-dock, + deepin-pdfium, + qt5integration, + qt5platform-plugins, + taglib, + ffmpeg, + ffmpegthumbnailer, + pcre, + dbus, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index 46fb6480ca4d6..bdbd5e1b136be 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -1,17 +1,18 @@ -{ lib -, runCommand -, glib -, gtk3 -, dde-grand-search -, startdde -, dde-session-shell -, dde-file-manager -, deepin-desktop-schemas -, deepin-movie-reborn -, deepin-system-monitor -, gsettings-desktop-schemas -, extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [ ] +{ + lib, + runCommand, + glib, + gtk3, + dde-grand-search, + startdde, + dde-session-shell, + dde-file-manager, + deepin-desktop-schemas, + deepin-movie-reborn, + deepin-system-monitor, + gsettings-desktop-schemas, + extraGSettingsOverrides ? "", + extraGSettingsOverridePackages ? [ ], }: let diff --git a/pkgs/desktops/deepin/core/dde-launchpad/default.nix b/pkgs/desktops/deepin/core/dde-launchpad/default.nix index 7544bc5751752..d1474b5bea975 100644 --- a/pkgs/desktops/deepin/core/dde-launchpad/default.nix +++ b/pkgs/desktops/deepin/core/dde-launchpad/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qt6Packages -, qt6integration -, qt6platform-plugins -, dtk6declarative -, dde-shell +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qt6Packages, + qt6integration, + qt6platform-plugins, + dtk6declarative, + dde-shell, }: stdenv.mkDerivation rec { @@ -28,21 +29,21 @@ stdenv.mkDerivation rec { qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - qt6integration - qt6platform-plugins - dtk6declarative - dde-shell - ] ++ (with qt6Packages; [ - qtbase - qtsvg - qtwayland - appstream-qt - ]); + buildInputs = + [ + qt6integration + qt6platform-plugins + dtk6declarative + dde-shell + ] + ++ (with qt6Packages; [ + qtbase + qtsvg + qtwayland + appstream-qt + ]); - cmakeFlags = [ - "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" - ]; + cmakeFlags = [ "-DSYSTEMD_USER_UNIT_DIR=${placeholder "out"}/lib/systemd/user" ]; meta = with lib; { description = "'launcher' or 'start menu' component for DDE"; diff --git a/pkgs/desktops/deepin/core/dde-network-core/default.nix b/pkgs/desktops/deepin/core/dde-network-core/default.nix index 2c8f1860e57d6..518fd99548f06 100644 --- a/pkgs/desktops/deepin/core/dde-network-core/default.nix +++ b/pkgs/desktops/deepin/core/dde-network-core/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, qtbase -, qtsvg -, dtkwidget -, dde-dock -, dde-control-center -, dde-session-shell -, networkmanager-qt -, glib -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + qtbase, + qtsvg, + dtkwidget, + dde-dock, + dde-control-center, + dde-session-shell, + networkmanager-qt, + glib, + gtest, }: stdenv.mkDerivation rec { @@ -46,9 +47,7 @@ stdenv.mkDerivation rec { gtest ]; - cmakeFlags = [ - "-DVERSION=${version}" - ]; + cmakeFlags = [ "-DVERSION=${version}" ]; strictDeps = true; diff --git a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix index 2e6bd31a9395c..9b71012b11cac 100644 --- a/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/core/dde-polkit-agent/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-qt-dbus-factory -, pkg-config -, cmake -, qttools -, wrapQtAppsHook -, polkit-qt -, qtbase +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-qt-dbus-factory, + pkg-config, + cmake, + qttools, + wrapQtAppsHook, + polkit-qt, + qtbase, }: stdenv.mkDerivation rec { @@ -39,9 +40,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}" ]; postFixup = '' wrapQtApp $out/lib/polkit-1-dde/dde-polkit-agent diff --git a/pkgs/desktops/deepin/core/dde-session-shell/default.nix b/pkgs/desktops/deepin/core/dde-session-shell/default.nix index 9e9be74a4d6f0..91c44895e3358 100644 --- a/pkgs/desktops/deepin/core/dde-session-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-shell/default.nix @@ -1,26 +1,27 @@ -{ stdenv -, lib -, fetchFromGitHub -, linkFarm -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, wrapGAppsHook3 -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, deepin-pw-check -, gsettings-qt -, lightdm_qt -, qtx11extras -, linux-pam -, xorg -, gtest -, xkeyboard_config -, dbus -, dde-session-shell +{ + stdenv, + lib, + fetchFromGitHub, + linkFarm, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + wrapGAppsHook3, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + deepin-pw-check, + gsettings-qt, + lightdm_qt, + qtx11extras, + linux-pam, + xorg, + gtest, + xkeyboard_config, + dbus, + dde-session-shell, }: stdenv.mkDerivation rec { @@ -85,21 +86,24 @@ stdenv.mkDerivation rec { gtest ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; # 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}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [{ - path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; - name = "lightdm-deepin-greeter.desktop"; - }]; + passthru.xgreeters = linkFarm "deepin-greeter-xgreeters" [ + { + path = "${dde-session-shell}/share/xgreeters/lightdm-deepin-greeter.desktop"; + name = "lightdm-deepin-greeter.desktop"; + } + ]; meta = with lib; { description = "Deepin desktop-environment - session-shell module"; diff --git a/pkgs/desktops/deepin/core/dde-session-ui/default.nix b/pkgs/desktops/deepin/core/dde-session-ui/default.nix index 24085d682f0ba..a2ce7f0090212 100644 --- a/pkgs/desktops/deepin/core/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/core/dde-session-ui/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, qtbase -, dtkwidget -, qt5integration -, qt5platform-plugins -, dde-dock -, gsettings-qt -, qtx11extras -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + qtbase, + dtkwidget, + qt5integration, + qt5platform-plugins, + dde-dock, + gsettings-qt, + qtx11extras, + gtest, }: stdenv.mkDerivation rec { @@ -55,14 +56,10 @@ stdenv.mkDerivation rec { gtest ]; - cmakeFlags = [ - "-DDISABLE_SYS_UPDATE=ON" - ]; + cmakeFlags = [ "-DDISABLE_SYS_UPDATE=ON" ]; # 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}" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") diff --git a/pkgs/desktops/deepin/core/dde-session/default.nix b/pkgs/desktops/deepin/core/dde-session/default.nix index 87fe51cb211cc..291f20ea63c09 100644 --- a/pkgs/desktops/deepin/core/dde-session/default.nix +++ b/pkgs/desktops/deepin/core/dde-session/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, qtbase -, dtkcore -, gsettings-qt -, libsecret -, xorg -, systemd -, dde-polkit-agent +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qtbase, + dtkcore, + gsettings-qt, + libsecret, + xorg, + systemd, + dde-polkit-agent, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-shell/default.nix b/pkgs/desktops/deepin/core/dde-shell/default.nix index 8a66181c2fc94..72696ba352143 100644 --- a/pkgs/desktops/deepin/core/dde-shell/default.nix +++ b/pkgs/desktops/deepin/core/dde-shell/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules -, pkg-config -, wrapQtAppsHook -, wayland-scanner -, dtk6declarative -, dtk6widget -, dde-qt-dbus-factory -, qt6Packages -, qt6integration -, qt6platform-plugins -, kdePackages -, wayland -, wayland-protocols -, yaml-cpp -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + pkg-config, + wrapQtAppsHook, + wayland-scanner, + dtk6declarative, + dtk6widget, + dde-qt-dbus-factory, + qt6Packages, + qt6integration, + qt6platform-plugins, + kdePackages, + wayland, + wayland-protocols, + yaml-cpp, + xorg, }: stdenv.mkDerivation (finalAttrs: { @@ -73,15 +74,13 @@ stdenv.mkDerivation (finalAttrs: { env.PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - cmakeFlags = [ - "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" - ]; + cmakeFlags = [ "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" ]; qtWrapperArgs = [ - # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH - "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" - "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" - "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" + # qt6integration must be placed before qtsvg in QT_PLUGIN_PATH + "--prefix QT_PLUGIN_PATH : ${qt6integration}/${qt6Packages.qtbase.qtPluginPrefix}" + "--suffix DDE_SHELL_PLUGIN_PATH : /run/current-system/sw/lib/dde-shell" + "--suffix DDE_SHELL_PACKAGE_PATH : /run/current-system/sw/share/dde-shell" ]; meta = { diff --git a/pkgs/desktops/deepin/core/dde-widgets/default.nix b/pkgs/desktops/deepin/core/dde-widgets/default.nix index c8019509dabf1..4faa91d3ca08b 100644 --- a/pkgs/desktops/deepin/core/dde-widgets/default.nix +++ b/pkgs/desktops/deepin/core/dde-widgets/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, dde-qt-dbus-factory -, wrapQtAppsHook -, qtbase -, qtx11extras -, dtkwidget -, qt5integration -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + dde-qt-dbus-factory, + wrapQtAppsHook, + qtbase, + qtx11extras, + dtkwidget, + qt5integration, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/deepin-kwin/default.nix b/pkgs/desktops/deepin/core/deepin-kwin/default.nix index 1cd144b79e295..bb4ddee47bf20 100644 --- a/pkgs/desktops/deepin/core/deepin-kwin/default.nix +++ b/pkgs/desktops/deepin/core/deepin-kwin/default.nix @@ -1,37 +1,38 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wayland -, dwayland -, qtbase -, qttools -, qtx11extras -, wrapQtAppsHook -, extra-cmake-modules -, gsettings-qt -, libepoxy -, kconfig -, kconfigwidgets -, kcoreaddons -, kcrash -, kdbusaddons -, kiconthemes -, kglobalaccel -, kidletime -, knotifications -, kpackage -, plasma-framework -, kcmutils -, knewstuff -, kdecoration -, kscreenlocker -, breeze-qt5 -, libinput -, mesa -, lcms2 -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wayland, + dwayland, + qtbase, + qttools, + qtx11extras, + wrapQtAppsHook, + extra-cmake-modules, + gsettings-qt, + libepoxy, + kconfig, + kconfigwidgets, + kcoreaddons, + kcrash, + kdbusaddons, + kiconthemes, + kglobalaccel, + kidletime, + knotifications, + kpackage, + plasma-framework, + kcmutils, + knewstuff, + kdecoration, + kscreenlocker, + breeze-qt5, + libinput, + mesa, + lcms2, + xorg, }: stdenv.mkDerivation rec { @@ -45,9 +46,7 @@ stdenv.mkDerivation rec { hash = "sha256-EjPPjdxa+iL/nXhuccoM3NiLmGXh7Un2aGz8O3sP6xE="; }; - patches = [ - ./0001-hardcode-fallback-background.diff - ]; + patches = [ ./0001-hardcode-fallback-background.diff ]; # Avoid using absolute path to distinguish applications postPatch = '' @@ -101,11 +100,12 @@ stdenv.mkDerivation rec { xorg.libXScrnSaver ]; - cmakeFlags = [ - "-DKWIN_BUILD_RUNNERS=OFF" - ]; + cmakeFlags = [ "-DKWIN_BUILD_RUNNERS=OFF" ]; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; meta = with lib; { description = "Fork of kwin, an easy to use, but flexible, composited Window Manager"; diff --git a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix index a11f7717b6466..c76a095b2463e 100644 --- a/pkgs/desktops/deepin/core/deepin-service-manager/default.nix +++ b/pkgs/desktops/deepin/core/deepin-service-manager/default.nix @@ -1,9 +1,10 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix index 82c183ca00d58..e78ba159c95d3 100644 --- a/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/core/dpa-ext-gnomekeyring/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, dtkwidget -, dde-polkit-agent -, qt5integration -, libsecret +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qttools, + wrapQtAppsHook, + dtkwidget, + dde-polkit-agent, + qt5integration, + libsecret, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index f0a9c95ab2b9b..4280b290a3e63 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,110 +1,118 @@ -{ lib, pkgs, config, libsForQt5 }: +{ + lib, + pkgs, + config, + libsForQt5, +}: let - packages = self: - let - inherit (self) callPackage; - in { - #### LIBRARIES - dtkcommon = callPackage ./library/dtkcommon { }; - dtkcore = callPackage ./library/dtkcore { }; - dtkgui = callPackage ./library/dtkgui { }; - dtkwidget = callPackage ./library/dtkwidget { }; - dtkdeclarative = callPackage ./library/dtkdeclarative { }; - dtklog = callPackage ./library/dtklog { }; - deepin-pdfium = callPackage ./library/deepin-pdfium { }; - qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; - qt5integration = callPackage ./library/qt5integration { }; - deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; - deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; - dwayland = callPackage ./library/dwayland { }; - dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; - disomaster = callPackage ./library/disomaster { }; - docparser = callPackage ./library/docparser { }; - gio-qt = callPackage ./library/gio-qt { }; - image-editor = callPackage ./library/image-editor { }; - udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; - util-dfm = callPackage ./library/util-dfm { }; - dtk6core = callPackage ./library/dtk6core { }; - dtk6gui = callPackage ./library/dtk6gui { }; - dtk6widget = callPackage ./library/dtk6widget { }; - dtk6declarative = callPackage ./library/dtk6declarative { }; - dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; - dtk6log = callPackage ./library/dtk6log { }; - qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; - qt6integration = callPackage ./library/qt6integration { }; + packages = + self: + let + inherit (self) callPackage; + in + { + #### LIBRARIES + dtkcommon = callPackage ./library/dtkcommon { }; + dtkcore = callPackage ./library/dtkcore { }; + dtkgui = callPackage ./library/dtkgui { }; + dtkwidget = callPackage ./library/dtkwidget { }; + dtkdeclarative = callPackage ./library/dtkdeclarative { }; + dtklog = callPackage ./library/dtklog { }; + deepin-pdfium = callPackage ./library/deepin-pdfium { }; + qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; + qt5integration = callPackage ./library/qt5integration { }; + deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; + deepin-ocr-plugin-manager = callPackage ./library/deepin-ocr-plugin-manager { }; + dwayland = callPackage ./library/dwayland { }; + dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; + disomaster = callPackage ./library/disomaster { }; + docparser = callPackage ./library/docparser { }; + gio-qt = callPackage ./library/gio-qt { }; + image-editor = callPackage ./library/image-editor { }; + udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; + util-dfm = callPackage ./library/util-dfm { }; + dtk6core = callPackage ./library/dtk6core { }; + dtk6gui = callPackage ./library/dtk6gui { }; + dtk6widget = callPackage ./library/dtk6widget { }; + dtk6declarative = callPackage ./library/dtk6declarative { }; + dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; + dtk6log = callPackage ./library/dtk6log { }; + qt6platform-plugins = callPackage ./library/qt6platform-plugins { }; + qt6integration = callPackage ./library/qt6integration { }; - #### CORE - deepin-kwin = callPackage ./core/deepin-kwin { }; - dde-appearance = callPackage ./core/dde-appearance { }; - dde-app-services = callPackage ./core/dde-app-services { }; - dde-application-manager = callPackage ./core/dde-application-manager { }; - dde-control-center = callPackage ./core/dde-control-center { }; - dde-calendar = callPackage ./core/dde-calendar { }; - dde-clipboard = callPackage ./core/dde-clipboard { }; - dde-dock = callPackage ./core/dde-dock { }; - dde-file-manager = callPackage ./core/dde-file-manager { }; - dde-launchpad = callPackage ./core/dde-launchpad { }; - dde-network-core = callPackage ./core/dde-network-core { }; - dde-session = callPackage ./core/dde-session { }; - dde-session-shell = callPackage ./core/dde-session-shell { }; - dde-session-ui = callPackage ./core/dde-session-ui { }; - deepin-service-manager = callPackage ./core/deepin-service-manager { }; - dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; - dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; - dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; - dde-widgets = callPackage ./core/dde-widgets { }; - dde-shell = callPackage ./core/dde-shell { }; - dde-grand-search = callPackage ./core/dde-grand-search { }; + #### CORE + deepin-kwin = callPackage ./core/deepin-kwin { }; + dde-appearance = callPackage ./core/dde-appearance { }; + dde-app-services = callPackage ./core/dde-app-services { }; + dde-application-manager = callPackage ./core/dde-application-manager { }; + dde-control-center = callPackage ./core/dde-control-center { }; + dde-calendar = callPackage ./core/dde-calendar { }; + dde-clipboard = callPackage ./core/dde-clipboard { }; + dde-dock = callPackage ./core/dde-dock { }; + dde-file-manager = callPackage ./core/dde-file-manager { }; + dde-launchpad = callPackage ./core/dde-launchpad { }; + dde-network-core = callPackage ./core/dde-network-core { }; + dde-session = callPackage ./core/dde-session { }; + dde-session-shell = callPackage ./core/dde-session-shell { }; + dde-session-ui = callPackage ./core/dde-session-ui { }; + deepin-service-manager = callPackage ./core/deepin-service-manager { }; + dde-polkit-agent = callPackage ./core/dde-polkit-agent { }; + dpa-ext-gnomekeyring = callPackage ./core/dpa-ext-gnomekeyring { }; + dde-gsettings-schemas = callPackage ./core/dde-gsettings-schemas { }; + dde-widgets = callPackage ./core/dde-widgets { }; + dde-shell = callPackage ./core/dde-shell { }; + dde-grand-search = callPackage ./core/dde-grand-search { }; - #### Dtk Application - deepin-album = callPackage ./apps/deepin-album { }; - deepin-calculator = callPackage ./apps/deepin-calculator { }; - deepin-camera = callPackage ./apps/deepin-camera { }; - deepin-compressor = callPackage ./apps/deepin-compressor { }; - deepin-draw = callPackage ./apps/deepin-draw { }; - deepin-editor = callPackage ./apps/deepin-editor { }; - deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; - deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; - deepin-music = callPackage ./apps/deepin-music { }; - deepin-picker = callPackage ./apps/deepin-picker { }; - deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; - deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; - deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; - deepin-terminal = callPackage ./apps/deepin-terminal { }; - deepin-reader = callPackage ./apps/deepin-reader { }; - deepin-voice-note = callPackage ./apps/deepin-voice-note { }; - deepin-screensaver = callPackage ./apps/deepin-screensaver { }; + #### Dtk Application + deepin-album = callPackage ./apps/deepin-album { }; + deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-camera = callPackage ./apps/deepin-camera { }; + deepin-compressor = callPackage ./apps/deepin-compressor { }; + deepin-draw = callPackage ./apps/deepin-draw { }; + deepin-editor = callPackage ./apps/deepin-editor { }; + deepin-image-viewer = callPackage ./apps/deepin-image-viewer { }; + deepin-movie-reborn = callPackage ./apps/deepin-movie-reborn { }; + deepin-music = callPackage ./apps/deepin-music { }; + deepin-picker = callPackage ./apps/deepin-picker { }; + deepin-screen-recorder = callPackage ./apps/deepin-screen-recorder { }; + deepin-shortcut-viewer = callPackage ./apps/deepin-shortcut-viewer { }; + deepin-system-monitor = callPackage ./apps/deepin-system-monitor { }; + deepin-terminal = callPackage ./apps/deepin-terminal { }; + deepin-reader = callPackage ./apps/deepin-reader { }; + deepin-voice-note = callPackage ./apps/deepin-voice-note { }; + deepin-screensaver = callPackage ./apps/deepin-screensaver { }; - #### Go Packages - dde-api = callPackage ./go-package/dde-api { }; - dde-daemon = callPackage ./go-package/dde-daemon { }; - deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; - deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; - startdde = callPackage ./go-package/startdde { }; + #### Go Packages + dde-api = callPackage ./go-package/dde-api { }; + dde-daemon = callPackage ./go-package/dde-daemon { }; + deepin-pw-check = callPackage ./go-package/deepin-pw-check { }; + deepin-desktop-schemas = callPackage ./go-package/deepin-desktop-schemas { }; + startdde = callPackage ./go-package/startdde { }; - #### TOOLS - dde-device-formatter = callPackage ./tools/dde-device-formatter { }; - deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; - deepin-anything = callPackage ./tools/deepin-anything { }; + #### TOOLS + dde-device-formatter = callPackage ./tools/dde-device-formatter { }; + deepin-gettext-tools = callPackage ./tools/deepin-gettext-tools { }; + deepin-anything = callPackage ./tools/deepin-anything { }; - #### ARTWORK - dde-account-faces = callPackage ./artwork/dde-account-faces { }; - deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; - deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; - deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; - deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; - deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { }; + #### ARTWORK + dde-account-faces = callPackage ./artwork/dde-account-faces { }; + deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; + deepin-wallpapers = callPackage ./artwork/deepin-wallpapers { }; + deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; + deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; + deepin-desktop-theme = callPackage ./artwork/deepin-desktop-theme { }; - #### MISC - deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; - deepin-turbo = callPackage ./misc/deepin-turbo { }; - } // lib.optionalAttrs config.allowAliases { - dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 - dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 - deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 - go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 - }; + #### MISC + deepin-desktop-base = callPackage ./misc/deepin-desktop-base { }; + deepin-turbo = callPackage ./misc/deepin-turbo { }; + } + // lib.optionalAttrs config.allowAliases { + dde-kwin = throw "The 'deepin.dde-kwin' package was removed as it is outdated and no longer relevant."; # added 2023-09-27 + dde-launcher = throw "The 'deepin.dde-launcher' is no longer maintained. Please use 'deepin.dde-launchpad' instead."; # added 2023-11-23 + deepin-clone = throw "The 'deepin.deepin-clone' package was removed as it is broken and unmaintained."; # added 2024-08-23 + go-lib = throw "Then 'deepin.go-lib' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + go-gir-generator = throw "Then 'deepin.go-gir-generator' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + go-dbus-factory = throw "Then 'deepin.go-dbus-factory' package was removed, use 'go mod' to manage it"; # added 2024-05-31 + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix index 209a631ef3944..d8b848851a823 100644 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -1,20 +1,21 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, pkg-config -, deepin-gettext-tools -, wrapQtAppsHook -, wrapGAppsHook3 -, alsa-lib -, gtk3 -, libcanberra -, libgudev -, librsvg -, poppler -, pulseaudio -, gdk-pixbuf-xlib -, coreutils -, dbus +{ + lib, + fetchFromGitHub, + buildGoModule, + pkg-config, + deepin-gettext-tools, + wrapQtAppsHook, + wrapGAppsHook3, + alsa-lib, + gtk3, + libcanberra, + libgudev, + librsvg, + poppler, + pulseaudio, + gdk-pixbuf-xlib, + coreutils, + dbus, }: buildGoModule rec { diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 68b85a3edadbc..563057ddebf0b 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -1,38 +1,39 @@ -{ lib -, fetchFromGitHub -, substituteAll -, buildGoModule -, pkg-config -, deepin-gettext-tools -, gettext -, python3 -, wrapGAppsHook3 -, ddcutil -, alsa-lib -, glib -, gtk3 -, libgudev -, libinput -, libnl -, librsvg -, linux-pam -, libxcrypt -, networkmanager -, pulseaudio -, gdk-pixbuf-xlib -, tzdata -, xkeyboard_config -, runtimeShell -, xorg -, xdotool -, getconf -, dbus -, util-linux -, dde-session-ui -, coreutils -, lshw -, dmidecode -, systemd +{ + lib, + fetchFromGitHub, + substituteAll, + buildGoModule, + pkg-config, + deepin-gettext-tools, + gettext, + python3, + wrapGAppsHook3, + ddcutil, + alsa-lib, + glib, + gtk3, + libgudev, + libinput, + libnl, + librsvg, + linux-pam, + libxcrypt, + networkmanager, + pulseaudio, + gdk-pixbuf-xlib, + tzdata, + xkeyboard_config, + runtimeShell, + xorg, + xdotool, + getconf, + dbus, + util-linux, + dde-session-ui, + coreutils, + lshw, + dmidecode, + systemd, }: buildGoModule rec { @@ -133,7 +134,16 @@ buildGoModule rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ util-linux dde-session-ui glib lshw dmidecode systemd ]}" + --prefix PATH : "${ + lib.makeBinPath [ + util-linux + dde-session-ui + glib + lshw + dmidecode + systemd + ] + }" ) ''; diff --git a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix index 61d7c18dca2d2..99b3a056dd92f 100644 --- a/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-desktop-schemas/default.nix @@ -1,8 +1,9 @@ -{ stdenv -, lib -, buildGoModule -, fetchFromGitHub -, glib +{ + stdenv, + lib, + buildGoModule, + fetchFromGitHub, + glib, }: buildGoModule rec { diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index 44c52c31a8e40..b1ad7c0c4c9ea 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -1,15 +1,16 @@ -{ lib -, fetchFromGitHub -, buildGoModule -, pkg-config -, deepin-gettext-tools -, gtk3 -, glib -, libxcrypt -, gettext -, iniparser -, cracklib -, linux-pam +{ + lib, + fetchFromGitHub, + buildGoModule, + pkg-config, + deepin-gettext-tools, + gtk3, + glib, + libxcrypt, + gettext, + iniparser, + cracklib, + linux-pam, }: buildGoModule rec { @@ -23,9 +24,7 @@ buildGoModule rec { hash = "sha256-kBrkcB0IWGUV4ZrkFzwdPglRgDcnVvYDFhTXS20pKOk="; }; - patches = [ - "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" - ]; + patches = [ "${src}/rpm/0001-Mangle-Suit-Cracklib2.9.6.patch" ]; vendorHash = "sha256-L0vUEkUN70Hrx5roIvTfaZBHbbq7mf3WpQJeFAMU5HY="; diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix index b5f1100874c1b..89f1602a1c7ac 100644 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -1,19 +1,20 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gettext -, pkg-config -, jq -, wrapGAppsHook3 -, glib -, libgnome-keyring -, gtk3 -, alsa-lib -, pulseaudio -, libgudev -, libsecret -, runtimeShell -, dbus +{ + lib, + buildGoModule, + fetchFromGitHub, + gettext, + pkg-config, + jq, + wrapGAppsHook3, + glib, + libgnome-keyring, + gtk3, + alsa-lib, + pulseaudio, + libgudev, + libsecret, + runtimeShell, + dbus, }: buildGoModule rec { diff --git a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix index 323a37cac79fc..9c14bf1379bb7 100644 --- a/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, qtbase -, wrapQtAppsHook -, python3 -, dtkcore +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + qtbase, + wrapQtAppsHook, + python3, + dtkcore, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix index 3db5f0a0bd349..34c7b83f818fb 100644 --- a/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix +++ b/pkgs/desktops/deepin/library/deepin-ocr-plugin-manager/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, cmake -, qttools -, wrapQtAppsHook -, libisoburn -, ncnn -, opencv -, vulkan-headers +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + cmake, + qttools, + wrapQtAppsHook, + libisoburn, + ncnn, + opencv, + vulkan-headers, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix index a4912eabe5f35..cbe86ed26257b 100644 --- a/pkgs/desktops/deepin/library/deepin-pdfium/default.nix +++ b/pkgs/desktops/deepin/library/deepin-pdfium/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, libchardet -, lcms2 -, openjpeg +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + libchardet, + lcms2, + openjpeg, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix index ad3dce815c91c..839b02633af91 100644 --- a/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix +++ b/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix @@ -1,8 +1,9 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/disomaster/default.nix b/pkgs/desktops/deepin/library/disomaster/default.nix index 908f328db9ff1..0e398b42c176b 100644 --- a/pkgs/desktops/deepin/library/disomaster/default.nix +++ b/pkgs/desktops/deepin/library/disomaster/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, qmake -, qttools -, wrapQtAppsHook -, libisoburn +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + qmake, + qttools, + wrapQtAppsHook, + libisoburn, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/docparser/default.nix b/pkgs/desktops/deepin/library/docparser/default.nix index 41b9a8ee7ce39..a283ac1098a9f 100644 --- a/pkgs/desktops/deepin/library/docparser/default.nix +++ b/pkgs/desktops/deepin/library/docparser/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, qmake -, qttools -, wrapQtAppsHook -, poppler +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + qmake, + qttools, + wrapQtAppsHook, + poppler, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix index cc89cbfcd87d3..31bf59583c047 100644 --- a/pkgs/desktops/deepin/library/dtk6core/default.nix +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, lshw -, libuchardet -, dtkcommon -, dtk6log +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + lshw, + libuchardet, + dtkcommon, + dtk6log, }: stdenv.mkDerivation (finalAttrs: { @@ -48,7 +49,10 @@ stdenv.mkDerivation (finalAttrs: { libuchardet ]; - propagatedBuildInputs = [ dtkcommon dtk6log ]; + propagatedBuildInputs = [ + dtkcommon + dtk6log + ]; cmakeFlags = [ "-DDTK_VERSION=${finalAttrs.version}" @@ -66,7 +70,11 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk6/DCore/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix index d5f13f22ac125..83d3140db7e48 100644 --- a/pkgs/desktops/deepin/library/dtk6declarative/default.nix +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6gui +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6gui, }: stdenv.mkDerivation (finalAttrs: { @@ -32,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.wrapQtAppsHook ]; - propagatedBuildInputs = [ - dtk6gui - ] ++ (with qt6Packages ; [ - qtbase - qtdeclarative - qtshadertools - qt5compat - ]); + propagatedBuildInputs = + [ dtk6gui ] + ++ (with qt6Packages; [ + qtbase + qtdeclarative + qtshadertools + qt5compat + ]); cmakeFlags = [ "-DDTK_VERSION=${finalAttrs.version}" @@ -57,7 +58,11 @@ stdenv.mkDerivation (finalAttrs: { export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; meta = { description = "Widget development toolkit based on QtQuick/QtQml"; diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix index 05a3b5333854e..53ca9621bb266 100644 --- a/pkgs/desktops/deepin/library/dtk6gui/default.nix +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -1,12 +1,13 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6core -, librsvg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6core, + librsvg, }: stdenv.mkDerivation (finalAttrs: { @@ -56,7 +57,11 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk6/DGui/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix index f6b185582031b..a3048cbd2b222 100644 --- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix +++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix @@ -1,12 +1,13 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6core -, libxcrypt +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6core, + libxcrypt, }: stdenv.mkDerivation rec { @@ -50,7 +51,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; meta = { description = "Qt-based development library for system settings"; diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix index da9e83223c620..7e47a4c92ca6a 100644 --- a/pkgs/desktops/deepin/library/dtk6widget/default.nix +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, qt6Packages -, dtk6gui -, cups -, libstartup_notification +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + qt6Packages, + dtk6gui, + cups, + libstartup_notification, }: stdenv.mkDerivation (finalAttrs: { @@ -40,14 +41,16 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - cups - libstartup_notification - ] ++ (with qt6Packages; [ - qtbase - qtmultimedia - qtsvg - ]); + buildInputs = + [ + cups + libstartup_notification + ] + ++ (with qt6Packages; [ + qtbase + qtmultimedia + qtsvg + ]); propagatedBuildInputs = [ dtk6gui ]; @@ -64,7 +67,11 @@ stdenv.mkDerivation (finalAttrs: { export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/lib/dtk6/DWidget/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtkcommon/default.nix b/pkgs/desktops/deepin/library/dtkcommon/default.nix index c1eb882a17e67..b7f7523abb9f5 100644 --- a/pkgs/desktops/deepin/library/dtkcommon/default.nix +++ b/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -1,7 +1,8 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake +{ + stdenv, + lib, + fetchFromGitHub, + cmake, }: stdenv.mkDerivation rec { @@ -15,9 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-e+8kG9bB6iby2RgD8jn75GyefLRHNnjD+n04hXbi5ec="; }; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; dontWrapQtApps = true; diff --git a/pkgs/desktops/deepin/library/dtkcore/default.nix b/pkgs/desktops/deepin/library/dtkcore/default.nix index f4241c8a20c05..980292bbf200c 100644 --- a/pkgs/desktops/deepin/library/dtkcore/default.nix +++ b/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, libsForQt5 -, gsettings-qt -, lshw -, libuchardet -, dtkcommon -, dtklog +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libsForQt5, + gsettings-qt, + lshw, + libuchardet, + dtkcommon, + dtklog, }: stdenv.mkDerivation rec { @@ -50,7 +51,10 @@ stdenv.mkDerivation rec { libuchardet ]; - propagatedBuildInputs = [ dtkcommon dtklog ]; + propagatedBuildInputs = [ + dtkcommon + dtklog + ]; cmakeFlags = [ "-DDTK_VERSION=${version}" @@ -69,7 +73,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk5/DCore/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix index 34a21b9c9cf49..189fdc13b0756 100644 --- a/pkgs/desktops/deepin/library/dtkdeclarative/default.nix +++ b/pkgs/desktops/deepin/library/dtkdeclarative/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, libsForQt5 -, dtkgui +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libsForQt5, + dtkgui, }: stdenv.mkDerivation rec { @@ -55,7 +56,11 @@ stdenv.mkDerivation rec { export QML2_IMPORT_PATH=${libsForQt5.qtdeclarative.bin}/${libsForQt5.qtbase.qtQmlPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; meta = with lib; { description = "Widget development toolkit based on QtQuick/QtQml"; diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 53fe9123dd2eb..1b8c912653660 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, cmake -, doxygen -, libsForQt5 -, dtkcore -, lxqt -, librsvg +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + cmake, + doxygen, + libsForQt5, + dtkcore, + lxqt, + librsvg, }: stdenv.mkDerivation rec { @@ -58,7 +59,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/libexec/dtk5/DGui/bin/*; do diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index b01049045cb5d..56100bedbdb36 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, doxygen -, libsForQt5 -, dtkgui -, cups -, gsettings-qt -, libstartup_notification -, xorg +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + doxygen, + libsForQt5, + dtkgui, + cups, + gsettings-qt, + libstartup_notification, + xorg, }: stdenv.mkDerivation rec { @@ -68,7 +69,11 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix} ''; - outputs = [ "out" "dev" "doc" ]; + outputs = [ + "out" + "dev" + "doc" + ]; postFixup = '' for binary in $out/lib/dtk5/DWidget/bin/*; do diff --git a/pkgs/desktops/deepin/library/dwayland/default.nix b/pkgs/desktops/deepin/library/dwayland/default.nix index 7de7292a4a05a..9dc651ce299c2 100644 --- a/pkgs/desktops/deepin/library/dwayland/default.nix +++ b/pkgs/desktops/deepin/library/dwayland/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, qtbase -, qtwayland -, wayland -, wayland-protocols -, extra-cmake-modules -, deepin-wayland-protocols -, qttools +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qtbase, + qtwayland, + wayland, + wayland-protocols, + extra-cmake-modules, + deepin-wayland-protocols, + qttools, }: stdenv.mkDerivation rec { @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { # cmake requires that the kf5 directory must not empty postInstall = '' - mkdir $out/include/KF5 + mkdir $out/include/KF5 ''; meta = with lib; { diff --git a/pkgs/desktops/deepin/library/gio-qt/default.nix b/pkgs/desktops/deepin/library/gio-qt/default.nix index f761444ea18db..df790e6609b49 100644 --- a/pkgs/desktops/deepin/library/gio-qt/default.nix +++ b/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, glibmm -, doxygen -, qttools -, qtbase -, buildDocs ? true +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + glibmm, + doxygen, + qttools, + qtbase, + buildDocs ? true, }: stdenv.mkDerivation rec { @@ -29,11 +30,16 @@ stdenv.mkDerivation rec { --replace "include(qt6.cmake)" " " ''; - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ] ++ lib.optionals buildDocs [ doxygen qttools.dev ]; + nativeBuildInputs = + [ + cmake + pkg-config + wrapQtAppsHook + ] + ++ lib.optionals buildDocs [ + doxygen + qttools.dev + ]; cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/desktops/deepin/library/image-editor/default.nix b/pkgs/desktops/deepin/library/image-editor/default.nix index 4a9c35b1aece6..576dda7f5a3e2 100644 --- a/pkgs/desktops/deepin/library/image-editor/default.nix +++ b/pkgs/desktops/deepin/library/image-editor/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, cmake -, qttools -, pkg-config -, wrapQtAppsHook -, opencv -, freeimage -, libmediainfo -, ffmpegthumbnailer -, pcre +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + cmake, + qttools, + pkg-config, + wrapQtAppsHook, + opencv, + freeimage, + libmediainfo, + ffmpegthumbnailer, + pcre, }: stdenv.mkDerivation rec { @@ -29,7 +30,12 @@ stdenv.mkDerivation rec { substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' ''; - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; buildInputs = [ dtkwidget @@ -40,9 +46,7 @@ stdenv.mkDerivation rec { pcre ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = with lib; { description = "Image editor lib for dtk"; diff --git a/pkgs/desktops/deepin/library/qt5integration/default.nix b/pkgs/desktops/deepin/library/qt5integration/default.nix index 41b4c7f9b03d5..ccf8f6a4817d8 100644 --- a/pkgs/desktops/deepin/library/qt5integration/default.nix +++ b/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, cmake -, pkg-config -, libsForQt5 -, lxqt -, mtdev -, xorg -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + cmake, + pkg-config, + libsForQt5, + lxqt, + mtdev, + xorg, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 291fc19d54744..fbf3879cf37b0 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, extra-cmake-modules -, pkg-config -, dtkcommon -, libsForQt5 -, mtdev -, cairo -, xorg -, wayland -, dwayland +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + extra-cmake-modules, + pkg-config, + dtkcommon, + libsForQt5, + mtdev, + cairo, + xorg, + wayland, + dwayland, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/qt6integration/default.nix b/pkgs/desktops/deepin/library/qt6integration/default.nix index 950c2ac5c3251..07b93c85f74cb 100644 --- a/pkgs/desktops/deepin/library/qt6integration/default.nix +++ b/pkgs/desktops/deepin/library/qt6integration/default.nix @@ -1,11 +1,12 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, dtk6widget -, qt6Packages -, gtest +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + dtk6widget, + qt6Packages, + gtest, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix index 335e728f8a2be..09bd21a248359 100644 --- a/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt6platform-plugins/default.nix @@ -1,13 +1,14 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, mtdev -, cairo -, xorg -, qt6Packages +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + mtdev, + cairo, + xorg, + qt6Packages, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix index 84321809ebebf..3a9be5a658798 100644 --- a/pkgs/desktops/deepin/library/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/library/udisks2-qt5/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, qmake -, pkg-config -, wrapQtAppsHook -, udisks +{ + stdenv, + lib, + fetchFromGitHub, + qmake, + pkg-config, + wrapQtAppsHook, + udisks, }: stdenv.mkDerivation rec { @@ -18,7 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; }; - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ udisks ]; diff --git a/pkgs/desktops/deepin/library/util-dfm/default.nix b/pkgs/desktops/deepin/library/util-dfm/default.nix index e3fe31526cf4f..140b28fc7327b 100644 --- a/pkgs/desktops/deepin/library/util-dfm/default.nix +++ b/pkgs/desktops/deepin/library/util-dfm/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, qtbase -, libmediainfo -, libsecret -, libisoburn -, libuuid -, udisks +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + qtbase, + libmediainfo, + libsecret, + libisoburn, + libuuid, + udisks, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index ae11200324504..7f4c433914c27 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -1,7 +1,8 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, nixos-icons +{ + stdenvNoCC, + lib, + fetchFromGitHub, + nixos-icons, }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; @@ -39,7 +40,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Base assets and definitions for Deepin Desktop Environment"; homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; - license = with licenses; [ gpl3Plus cc-by-40 ]; + license = with licenses; [ + gpl3Plus + cc-by-40 + ]; platforms = platforms.linux; maintainers = teams.deepin.members; }; diff --git a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix index 2d3c5a020884f..973df30e5bb56 100644 --- a/pkgs/desktops/deepin/misc/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-turbo/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, dtkwidget +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + dtkwidget, }: stdenv.mkDerivation rec { @@ -24,9 +25,7 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - dtkwidget - ]; + buildInputs = [ dtkwidget ]; postPatch = '' substituteInPlace src/{booster-dtkwidget/CMakeLists.txt,booster-desktop/{CMakeLists.txt,desktop.conf},booster-generic/CMakeLists.txt} --replace "/usr" "$out" diff --git a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix index fd6ae6f425413..08093b0befd71 100644 --- a/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix +++ b/pkgs/desktops/deepin/tools/dde-device-formatter/default.nix @@ -1,16 +1,17 @@ -{ stdenv -, lib -, fetchFromGitHub -, dtkwidget -, deepin-gettext-tools -, qt5integration -, qmake -, qtbase -, qttools -, qtx11extras -, pkg-config -, wrapQtAppsHook -, udisks2-qt5 +{ + stdenv, + lib, + fetchFromGitHub, + dtkwidget, + deepin-gettext-tools, + qt5integration, + qmake, + qtbase, + qttools, + qtx11extras, + pkg-config, + wrapQtAppsHook, + udisks2-qt5, }: stdenv.mkDerivation rec { @@ -49,9 +50,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DVERSION=${version}" ]; # 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}" ]; meta = with lib; { description = "Simple graphical interface for creating file system in a block device"; diff --git a/pkgs/desktops/deepin/tools/deepin-anything/default.nix b/pkgs/desktops/deepin/tools/deepin-anything/default.nix index cfcbb6f1c1f7b..42da994bbb001 100644 --- a/pkgs/desktops/deepin/tools/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/tools/deepin-anything/default.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, fetchFromGitHub -, cmake -, pkg-config -, wrapQtAppsHook -, udisks2-qt5 -, util-linux -, libnl -, glib -, pcre +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + udisks2-qt5, + util-linux, + libnl, + glib, + pcre, }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix index f9a789c219893..7f2db77f45671 100644 --- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix @@ -1,9 +1,10 @@ -{ stdenv -, lib -, fetchFromGitHub -, gettext -, python3Packages -, perlPackages +{ + stdenv, + lib, + fetchFromGitHub, + gettext, + python3Packages, + perlPackages, }: stdenv.mkDerivation rec { @@ -30,9 +31,7 @@ stdenv.mkDerivation rec { perlPackages.XMLLibXML ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postFixup = '' wrapPythonPrograms -- cgit 1.4.1