diff options
| author | Benjamin Staffin <benley@gmail.com> | 2017-03-16 17:48:09 -0400 |
|---|---|---|
| committer | Benjamin Staffin <benley@gmail.com> | 2017-03-16 17:48:09 -0400 |
| commit | c2b0cb5db6c9df000060501ca2dd5293694da216 (patch) | |
| tree | c55622fd827771b052b91bb611b6c90e2dcab66c | |
| parent | 14315cf4f59daf6efde281ac2be2e27602d39b41 (diff) | |
| download | nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.tar nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.tar.gz nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.tar.bz2 nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.tar.lz nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.tar.xz nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.tar.zst nixlib-c2b0cb5db6c9df000060501ca2dd5293694da216.zip | |
nixos: nix snowflake logo for the nixos manual launcher
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 5 | ||||
| -rw-r--r-- | pkgs/data/misc/nixos-artwork/icons.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 16 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 622607f3b32d..515864ec2e2d 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -62,8 +62,7 @@ let name = "nixos-manual"; desktopName = "NixOS Manual"; genericName = "View NixOS documentation in a web browser"; - # TODO: find a better icon (Nix logo + help overlay?) - icon = "system-help"; + icon = "nix-snowflake"; exec = "${helpScript}/bin/nixos-help"; categories = "System"; }; @@ -115,7 +114,7 @@ in environment.systemPackages = [ manual.manual helpScript ] - ++ optional config.services.xserver.enable desktopItem + ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons] ++ optional config.programs.man.enable manual.manpages; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix new file mode 100644 index 000000000000..cee6e600cbe0 --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/icons.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchFromGitHub, imagemagick }: + +stdenv.mkDerivation { + name = "nixos-icons-2017-03-16"; + srcs = fetchFromGitHub { + owner = "nixos"; + repo = "nixos-artwork"; + rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b"; + sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a"; + }; + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + buildInputs = [ imagemagick ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d6ab328d22c..5459b3ded5ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17830,6 +17830,7 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; + nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; nixos-container = callPackage ../tools/virtualization/nixos-container { }; |