aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix')
-rw-r--r--nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
index 0f47c82f032..92cec3ca82c 100644
--- a/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/nixpkgs/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; {