Unverified Commit 249d3f30 authored by davidak's avatar davidak Committed by GitHub
Browse files

Merge pull request #140828 from bobby285271/evince 

pantheon.evince: init
parents 97774c04 609928f5

nixos/modules/programs/evince.nix

+13 −4
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 


with lib;



{

let cfg = config.programs.evince;



in {



  # Added 2019-08-09

  imports = [
@@ -22,6 +24,13 @@ with lib; 
      enable = mkEnableOption

        "Evince, the GNOME document viewer";



      package = mkOption {

        type = types.package;

        default = pkgs.evince;

        defaultText = literalExpression "pkgs.evince";

        description = "Evince derivation to use.";

      };



    };



  };
@@ -31,11 +40,11 @@ with lib; 


  config = mkIf config.programs.evince.enable {



    environment.systemPackages = [ pkgs.evince ];

    environment.systemPackages = [ cfg.package ];



    services.dbus.packages = [ pkgs.evince ];

    services.dbus.packages = [ cfg.package ];



    systemd.packages = [ pkgs.evince ];

    systemd.packages = [ cfg.package ];



  };

nixos/modules/services/x11/desktop-managers/pantheon.nix

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ in 
      ] config.environment.pantheon.excludePackages);



      programs.evince.enable = mkDefault true;

      programs.evince.package = pkgs.pantheon.evince;

      programs.file-roller.enable = mkDefault true;



      # Settings from elementary-default-settings

pkgs/desktops/gnome/core/epiphany/default.nix

+7 −3
Original line number Diff line number Diff line
@@ -47,9 +47,11 @@ stdenv.mkDerivation rec { 
  };



  patches = lib.optionals withPantheon [

    # Make this respect dark mode settings from Pantheon

    # https://github.com/elementary/browser

    ./dark-style.patch

    ./navigation-buttons.patch

    # The patch currently differs from upstream (updated for epiphany 40 and 41).

    ./pantheon-dark-style.patch

    ./pantheon-navigation-buttons.patch

  ];



  nativeBuildInputs = [
@@ -95,7 +97,9 @@ stdenv.mkDerivation rec { 
    p11-kit

    sqlite

    webkitgtk

  ] ++ lib.optional withPantheon pantheon.granite;

  ] ++ lib.optionals withPantheon [

    pantheon.granite

  ];



  # Tests need an X display

  mesonFlags = [