public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix remaining sane{Front,Back}ends

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-05 20:37:45 +01:00
parent 9f2a7bf862
commit ad200bb5bc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/sane/xsane.nix
View File

@ -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 , libusb ? null
, gimpSupport ? false, gimp_2_8 ? null , gimpSupport ? false, gimp_2_8 ? null
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
chmod a+rX -R . 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 []) ++ (if libusb != null then [libusb] else [])
++ stdenv.lib.optional gimpSupport gimp_2_8; ++ stdenv.lib.optional gimpSupport gimp_2_8;

6
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -35450,18 +35450,18 @@ self: {
}) {}; }) {};
"bindings-sane" = callPackage "bindings-sane" = callPackage
({ mkDerivation, base, bindings-DSL, saneBackends }: ({ mkDerivation, base, bindings-DSL, sane-backends }:
mkDerivation { mkDerivation {
pname = "bindings-sane"; pname = "bindings-sane";
version = "0.0.1"; version = "0.0.1";
sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b"; sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";
libraryHaskellDepends = [ base bindings-DSL ]; libraryHaskellDepends = [ base bindings-DSL ];
libraryPkgconfigDepends = [ saneBackends ]; libraryPkgconfigDepends = [ sane-backends ];
homepage = "http://floss.scru.org/bindings-sane"; homepage = "http://floss.scru.org/bindings-sane";
description = "FFI bindings to libsane"; description = "FFI bindings to libsane";
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {saneBackends = null;}; }) {sane-backends = null;};
"bindings-sc3" = callPackage "bindings-sc3" = callPackage
({ mkDerivation, base, bindings-DSL, scsynth }: ({ mkDerivation, base, bindings-DSL, scsynth }: