From bdd69a9b0c99757a9dc6eccc66177a38d91dad4a Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:26 +0000 Subject: [PATCH] sane-backends, sane-backends-git: move defaults to package file --- pkgs/top-level/all-packages.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe03d940973..5d0eede6ba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22780,15 +22780,9 @@ in samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = res.samsung-unified-linux-driver_4_01_17; - sane-backends = callPackage ../applications/graphics/sane/backends { - gt68xxFirmware = config.sane.gt68xxFirmware or null; - snapscanFirmware = config.sane.snapscanFirmware or null; - }; + sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); - sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix { - gt68xxFirmware = config.sane.gt68xxFirmware or null; - snapscanFirmware = config.sane.snapscanFirmware or null; - }; + sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); brlaser = callPackage ../misc/cups/drivers/brlaser { };