From ad200bb5bccb6b607ceb4fc6e02ecba1d5b6021c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 5 Jan 2016 20:37:45 +0100 Subject: [PATCH] Fix remaining sane{Front,Back}ends --- pkgs/applications/graphics/sane/xsane.nix | 4 ++-- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 85b23e3c2f2..751f31f73f2 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, saneFrontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends saneFrontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d864dc584ca..87e2bd68c81 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -35450,18 +35450,18 @@ self: { }) {}; "bindings-sane" = callPackage - ({ mkDerivation, base, bindings-DSL, saneBackends }: + ({ mkDerivation, base, bindings-DSL, sane-backends }: mkDerivation { pname = "bindings-sane"; version = "0.0.1"; sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b"; libraryHaskellDepends = [ base bindings-DSL ]; - libraryPkgconfigDepends = [ saneBackends ]; + libraryPkgconfigDepends = [ sane-backends ]; homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {saneBackends = null;}; + }) {sane-backends = null;}; "bindings-sc3" = callPackage ({ mkDerivation, base, bindings-DSL, scsynth }: