diff options
author | Victor multun Collod <victor.collod@epita.fr> | 2019-10-16 17:47:17 +0200 |
---|---|---|
committer | Victor multun Collod <victor.collod@epita.fr> | 2019-10-16 17:47:33 +0200 |
commit | ec2a8d2302ecb6fe6fdba884d363406313eb0d6e (patch) | |
tree | 84eee70bb6e12281ec5db700d721ea82fd0dcc49 | |
parent | 61eecf2a39f5b56a525ad4b355f1853684aab530 (diff) | |
download | nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.tar nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.tar.gz nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.tar.bz2 nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.tar.lz nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.tar.xz nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.tar.zst nixlib-ec2a8d2302ecb6fe6fdba884d363406313eb0d6e.zip |
sane-backends: remove /etc/sane.d/net.conf
-rw-r--r-- | pkgs/applications/graphics/sane/backends/generic.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index 0f47c82f0325..92cec3ca82c2 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -57,6 +57,9 @@ stdenv.mkDerivation { substituteInPlace $out/lib/libsane.la \ --replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg" + + # net.conf conflicts with the file generated by the nixos module + rm -f $out/etc/sane.d/net.conf '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware); meta = with stdenv.lib; { |