diff options
| author | rewine <luhongxu@deepin.org> | 2024-01-13 01:53:22 +0800 |
|---|---|---|
| committer | rewine <luhongxu@deepin.org> | 2024-01-15 14:19:50 +0800 |
| commit | 7e27869a75e16cb919750ceb1e46d9525f3360b5 (patch) | |
| tree | daf8d4e8f81d01665837741da2cff4ba15bb02c9 | |
| parent | bda32aac5c9f31e10c414c603cef3e5b558ec3d4 (diff) | |
deepin: move distribution.info back to deepin-desktop-base
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/deepin.nix | 11 | ||||
| -rw-r--r-- | pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 7fdd50b1ed263..7d3acada60739 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -96,18 +96,10 @@ in "/share/dde-daemon" "/share/dsg" "/share/deepin-themes" + "/share/deepin" ]; environment.etc = { - "distribution.info".text = '' - [Distribution] - Name=NixOS - WebsiteName=www.nixos.org - Website=https://www.nixos.org - Logo=${pkgs.nixos-icons}/share/icons/hicolor/96x96/apps/nix-snowflake.png - LogoLight=${pkgs.nixos-icons}/share/icons/hicolor/32x32/apps/nix-snowflake.png - LogoTransparent=${pkgs.deepin.deepin-desktop-base}/share/pixmaps/distribution_logo_transparent.svg - ''; "deepin-installer.conf".text = '' system_info_vendor_name="Copyright (c) 2003-2023 NixOS contributors" ''; @@ -156,6 +148,7 @@ in deepin-sound-theme deepin-gtk-theme deepin-wallpapers + deepin-desktop-base startdde dde-dock diff --git a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix index aa31bf975ad05..50fa2c6e72e79 100644 --- a/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/misc/deepin-desktop-base/default.nix @@ -1,6 +1,7 @@ { stdenvNoCC , lib , fetchFromGitHub +, nixos-icons }: stdenvNoCC.mkDerivation rec { pname = "deepin-desktop-base"; @@ -24,6 +25,15 @@ stdenvNoCC.mkDerivation rec { mv $out/usr/* $out/ rm -r $out/usr install -D ${./distribution_logo_transparent.svg} $out/share/pixmaps/distribution_logo_transparent.svg + cat > $out/share/deepin/distribution.info <<EOF + [Distribution] + Name=NixOS + WebsiteName=www.nixos.org + Website=https://www.nixos.org + Logo=${nixos-icons}/share/icons/hicolor/96x96/apps/nix-snowflake.png + LogoLight=${nixos-icons}/share/icons/hicolor/32x32/apps/nix-snowflake.png + LogoTransparent=$out/share/pixmaps/distribution_logo_transparent.svg + EOF ''; meta = with lib; { |