From f8caa49f003803856a0db4febd1bbb334ae2a26e Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Aug 2015 13:54:34 +0200
Subject: [PATCH 1/2] sane-config: Merge /etc/sane.d/dll.conf content.

---
 pkgs/applications/graphics/sane/config.nix | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index fc1cd81ebc6e..26f1eddbed69 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -4,17 +4,27 @@
 
 with stdenv.lib;
 let installSanePath = path: ''
-      find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
-        ln -s $backend $out/lib/sane/$(basename $backend)
-      done
+      if test -e "${path}/lib/sane"; then
+        find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
+          ln -s $backend $out/lib/sane/$(basename $backend)
+        done
+      fi
 
-      find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
-        ln -s $conf $out/etc/sane.d/$(basename $conf)
-      done
+      if test -e "${path}/etc/sane.d"; then
+        find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
+          if test $(basename $conf) = "dll.conf"; then
+            cat $conf >> $out/etc/sane.d/dll.conf
+          else
+            ln -s $conf $out/etc/sane.d/$(basename $conf)
+          fi
+        done
+      fi
 
-      find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
-        ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
-      done
+      if test -e "${path}/etc/sane.d/dll.d"; then
+        find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
+          ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
+        done
+      fi
     '';
 in
 stdenv.mkDerivation {

From bb81ba7ef662da75566c5642d709c624b245f03c Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Aug 2015 13:55:25 +0200
Subject: [PATCH 2/2] sane-config: Prevent find warnings by moving maxdepth
 argument first.

---
 pkgs/applications/graphics/sane/config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix
index 26f1eddbed69..4b8c7a4fe921 100644
--- a/pkgs/applications/graphics/sane/config.nix
+++ b/pkgs/applications/graphics/sane/config.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 let installSanePath = path: ''
       if test -e "${path}/lib/sane"; then
-        find "${path}/lib/sane" -not -type d -maxdepth 1 | while read backend; do
+        find "${path}/lib/sane" -maxdepth 1 -not -type d | while read backend; do
           ln -s $backend $out/lib/sane/$(basename $backend)
         done
       fi
 
       if test -e "${path}/etc/sane.d"; then
-        find "${path}/etc/sane.d" -not -type d -maxdepth 1 | while read conf; do
+        find "${path}/etc/sane.d" -maxdepth 1 -not -type d | while read conf; do
           if test $(basename $conf) = "dll.conf"; then
             cat $conf >> $out/etc/sane.d/dll.conf
           else
@@ -21,7 +21,7 @@ let installSanePath = path: ''
       fi
 
       if test -e "${path}/etc/sane.d/dll.d"; then
-        find "${path}/etc/sane.d/dll.d" -not -type d -maxdepth 1 | while read conf; do
+        find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | while read conf; do
           ln -s $conf $out/etc/sane.d/dll.d/$(basename $conf)
         done
       fi