From 44c752a58a62dce270c44e355c8aec2991dbd39b Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 15 Jan 2024 11:26:19 +0800 Subject: [PATCH 1/2] deepin: don't install packages using freeimage by default --- nixos/modules/services/x11/desktop-managers/deepin.nix | 9 +++++---- .../deepin/core/dde-gsettings-schemas/default.nix | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 7fdd50b1ed26..68aaccef0791 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -180,19 +180,20 @@ in ]; optionalPackages = [ onboard # dde-dock plugin - deepin-camera deepin-calculator deepin-compressor deepin-editor deepin-picker deepin-draw - deepin-album - deepin-image-viewer deepin-music deepin-movie-reborn deepin-system-monitor - deepin-screen-recorder deepin-shortcut-viewer + # freeimage has knownVulnerabilties, don't install packages using freeiamge by default + # deepin-album + # deepin-camera + # deepin-image-viewer + # deepin-screen-recorder ]; in requiredPackages diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index a609d707a03c..c1a26e100a29 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -9,7 +9,6 @@ , dde-file-manager , deepin-desktop-schemas , deepin-movie-reborn -, deepin-screen-recorder , deepin-system-monitor , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -24,7 +23,6 @@ let dde-file-manager deepin-desktop-schemas deepin-movie-reborn - deepin-screen-recorder deepin-system-monitor gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background ] ++ extraGSettingsOverridePackages; From b833c891a3ca2cf16ae2c5926b94f728e73b2776 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 15 Jan 2024 11:01:00 +0800 Subject: [PATCH 2/2] deepin.dtkgui: avoid use freeimage --- pkgs/desktops/deepin/library/dtkgui/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 7d21911be6b1..0094f5a305f8 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -12,8 +12,6 @@ , qtimageformats , lxqt , librsvg -, freeimage -, libraw }: stdenv.mkDerivation rec { @@ -50,8 +48,6 @@ stdenv.mkDerivation rec { qtbase lxqt.libqtxdg librsvg - freeimage - libraw ]; propagatedBuildInputs = [