alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #78773 from layus/sane-override

Browse source 
sane module: support overriding config files
This commit is contained in:
Thomas Tuegel 2020-02-10 10:53:57 -06:00 committed by GitHub
parent 079622ef2d 4979541cad
commit b78092a551
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/graphics/sane/config.nix
View file

@ -6,7 +6,7 @@ with stdenv.lib;
let installSanePath = path: '' let installSanePath = path: ''
if [ -e "${path}/lib/sane" ]; then if [ -e "${path}/lib/sane" ]; then
find "${path}/lib/sane" -maxdepth 1 -not -type d | 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")" symlink "$backend" "$out/lib/sane/$(basename "$backend")"
done done
fi fi
@ -16,14 +16,14 @@ let installSanePath = path: ''
if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then if [ "$name" = "dll.conf" ] || [ "$name" = "saned.conf" ] || [ "$name" = "net.conf" ]; then
cat "$conf" >> "$out/etc/sane.d/$name" cat "$conf" >> "$out/etc/sane.d/$name"
else else
ln -s "$conf" "$out/etc/sane.d/$name" symlink "$conf" "$out/etc/sane.d/$name"
fi fi
done done
fi fi
if [ -e "${path}/etc/sane.d/dll.d" ]; then if [ -e "${path}/etc/sane.d/dll.d" ]; then
find "${path}/etc/sane.d/dll.d" -maxdepth 1 -not -type d | 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)" symlink "$conf" "$out/etc/sane.d/dll.d/$(basename $conf)"
done done
fi fi
''; '';
@ -33,6 +33,14 @@ stdenv.mkDerivation {
phases = "installPhase"; phases = "installPhase";
installPhase = '' installPhase = ''
function symlink () {
local target=$1 linkname=$2
if [ -e "$linkname" ]; then
echo "warning: conflict for $linkname. Overriding $(readlink $linkname) with $target."
fi
ln -sfn "$target" "$linkname"
}
mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane
'' + concatMapStrings installSanePath paths; '' + concatMapStrings installSanePath paths;
} }