commit 6b879ef36ea55958e2b6f621881d2ef05148cb46 · pyrox.dev/nixpkgs

+2 -3

nixos/modules/services/misc/nixos-manual.nix

···

       62
       62
        
           name = "nixos-manual";

     

       63
       63
        
           desktopName = "NixOS Manual";

     

       64
       64
        
           genericName = "View NixOS documentation in a web browser";

     

       65
       65
       -
           # TODO: find a better icon (Nix logo + help overlay?)

     

       66
       66
       -
           icon = "system-help";

     

       65
       65
       +
           icon = "nix-snowflake";

     

       67
       66
        
           exec = "${helpScript}/bin/nixos-help";

     

       68
       67
        
           categories = "System";

     

       69
       68
        
         };

     
···

       115
       114
        
       

     

       116
       115
        
           environment.systemPackages =

     

       117
       116
        
             [ manual.manual helpScript ]

     

       118
       118
       -
             ++ optional config.services.xserver.enable desktopItem

     

       117
       117
       +
             ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons]

     

       119
       118
        
             ++ optional config.programs.man.enable manual.manpages;

     

       120
       119
        
       

     

       121
       120
        
           boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];

+13

pkgs/data/misc/nixos-artwork/icons.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, imagemagick }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation {

     

       4
       4
       +
         name = "nixos-icons-2017-03-16";

     

       5
       5
       +
         srcs = fetchFromGitHub {

     

       6
       6
       +
           owner = "nixos";

     

       7
       7
       +
           repo = "nixos-artwork";

     

       8
       8
       +
           rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b";

     

       9
       9
       +
           sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a";

     

       10
       10
       +
         };

     

       11
       11
       +
         makeFlags = [ "DESTDIR=$(out)" "prefix=" ];

     

       12
       12
       +
         buildInputs = [ imagemagick ];

     

       13
       13
       +
       }

+1

pkgs/top-level/all-packages.nix

···

       18653
       18653
        
         nix-serve = callPackage ../tools/package-management/nix-serve { };

     

       18654
       18654
        
       

     

       18655
       18655
        
         nixos-artwork = callPackage ../data/misc/nixos-artwork { };

     

       18656
       18656
       +
         nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { };

     

       18656
       18657
        
       

     

       18657
       18658
        
         nixos-container = callPackage ../tools/virtualization/nixos-container { };

     

       18658
       18659