Merge pull request #71237 from multun/sane_net.conf_conflict

sane-backends: remove $out/etc/sane.d/net.conf
2019-10-17 17:03:53 +02:00 · 2019-10-17 17:03:53 +02:00 · e6167ceaa2
parent 0256080d11 ec2a8d2302
commit e6167ceaa2
1 changed files with 3 additions and 0 deletions
--- 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; {