diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2007-08-08 20:33:36 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2007-08-08 20:33:36 +0000 |
| commit | 4d54140043c984f30f646384b40bb9058553f010 (patch) | |
| tree | 23a11567e6833472fa053fa0f423a65a24ad8471 /pkgs/misc | |
| parent | 681551d96c81032f919ff713c091dfc2bd042085 (diff) | |
Various.. Added ircd-hybrid. Added USB support in SANE. Added Xsane. Added gt68xx firmware support.
svn path=/nixpkgs/trunk/; revision=9070
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/sane-backends/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/misc/sane-front/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/misc/xsane/default.nix | 13 |
3 files changed, 35 insertions, 1 deletions
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index cfd47bfc63c38..fff030a625c78 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/pkgs/misc/sane-backends/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, hotplugSupport ? false}: +{stdenv, fetchurl, hotplugSupport ? false, libusb ? null, + gt68xxFirmware ? null}: assert hotplugSupport -> stdenv.system == "i686-linux"; @@ -10,4 +11,11 @@ stdenv.mkDerivation { md5 = "7ca7e2908e24721471de92cf40c75e60"; }; udevSupport = hotplugSupport; + + buildInputs = (if libusb != null then [libusb] else []); + + preInstall = (if gt68xxFirmware != null then + "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + + (gt68xxFirmware {inherit fetchurl;})+ " \${out}/share/sane/gt68xx/PS1fw.usb " + else ""); } diff --git a/pkgs/misc/sane-front/default.nix b/pkgs/misc/sane-front/default.nix new file mode 100644 index 0000000000000..b79331746be69 --- /dev/null +++ b/pkgs/misc/sane-front/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, saneBackends, libX11, gtk, + pkgconfig, libusb ? null}: +stdenv.mkDerivation { + name = "sane-frontend"; + + src = fetchurl { + url = ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz; + md5 = "c63bf7b0bb5f530cf3c08715db721cd3"; + }; + + buildInputs = [saneBackends libX11 gtk pkgconfig] ++ + (if (libusb != null) then [libusb] else []); +} diff --git a/pkgs/misc/xsane/default.nix b/pkgs/misc/xsane/default.nix new file mode 100644 index 0000000000000..fd7828696d48c --- /dev/null +++ b/pkgs/misc/xsane/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, saneBackends, saneFrontends, + libX11, gtk, pkgconfig, libusb ? null}: +stdenv.mkDerivation { + name = "xsane-0.97"; + + src = fetchurl { + url = ftp://ftp.sane-project.org/pub/sane/xsane/xsane-0.97.tar.gz; + md5 = "3d1f889d88c3462594febd53be58c561"; + }; + + buildInputs = [saneBackends saneFrontends libX11 gtk pkgconfig ] ++ + (if (libusb != null) then [libusb] else []); +} |