diff options
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/sane/backends/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/graphics/viewnior/default.nix | 4 |
2 files changed, 3 insertions, 4 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; { diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 4f5fb12faa62..a80e89e72bcd 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { shared-mime-info glib gdk-pixbuf perl ]; - preFixup = '' - rm $out/share/icons/*/icon-theme.cache - ''; - meta = { description = "Fast and simple image viewer"; longDescription = |