From 46107a6a80379dbe42b3d2416ba53b48e4d29162 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:33:34 +0000 Subject: [PATCH] zathura: move defaults to package file --- pkgs/applications/misc/zathura/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index e67bebb3710..315df563946 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,4 +1,6 @@ -{ pkgs, useMupdf ? true, synctexSupport ? true }: +{ config, pkgs +, useMupdf ? config.zathura.useMupdf or true +, synctexSupport ? true }: let callPackage = pkgs.newScope self; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2209574c41..72ecb119fc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20362,9 +20362,7 @@ in boost = boost160; }; - zathura = callPackage ../applications/misc/zathura { - useMupdf = config.zathura.useMupdf or true; - }; + zathura = callPackage ../applications/misc/zathura { }; zeroc_ice = callPackage ../development/libraries/zeroc-ice { inherit (darwin.apple_sdk.frameworks) Security;