Merge pull request #281058 from wineee/fi
deepin: don't install packages using freeimage by default
This commit is contained in:
commit
e5e1de76b7
3 changed files with 5 additions and 10 deletions
|
@ -173,19 +173,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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 = [
|
||||
|
|
Loading…
Reference in a new issue