diff options
author | Peter Simons <simons@cryp.to> | 2012-11-26 16:17:31 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2012-11-26 16:18:05 +0100 |
commit | a814d0bc90927c7ac797f1f69bdd29caa7175a7f (patch) | |
tree | d16978f2f47072694e1c35badd600439f037e22f /pkgs/misc | |
parent | fc57b8940b9e7d3cceac582e9e63514cb2b848a8 (diff) | |
download | nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.tar nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.tar.gz nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.tar.bz2 nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.tar.lz nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.tar.xz nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.tar.zst nixlib-a814d0bc90927c7ac797f1f69bdd29caa7175a7f.zip |
SANE: switch snapshot version of the backends to git (and general cleanup)
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/sane-backends/default.nix | 39 | ||||
-rw-r--r-- | pkgs/misc/sane-backends/snapshot.nix | 32 | ||||
-rw-r--r-- | pkgs/misc/sane-front/default.nix | 17 | ||||
-rw-r--r-- | pkgs/misc/xsane/default.nix | 25 |
4 files changed, 0 insertions, 113 deletions
diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix deleted file mode 100644 index ac6fed5deb46..000000000000 --- a/pkgs/misc/sane-backends/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, hotplugSupport ? true, libusb ? null, libv4l ? null -, pkgconfig ? null -, gt68xxFirmware ? null }: -let - firmware = gt68xxFirmware {inherit fetchurl;}; -in -assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); - -stdenv.mkDerivation rec { - version = "1.0.23"; - name = "sane-backends-${version}"; - - src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/sane-backends_${version}.orig.tar.gz"; - sha256 = "4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029"; - }; - - udevSupport = hotplugSupport; - - buildInputs = [] - ++ stdenv.lib.optional (libusb != null) libusb - ++ stdenv.lib.optional (libv4l != null) libv4l - ++ stdenv.lib.optional (pkgconfig != null) pkgconfig - ; - - postInstall = '' - if test "$udevSupport" = "1"; then - mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules - fi - ''; - - preInstall = - if gt68xxFirmware != null then - "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + - " \${out}/share/sane/gt68xx/" + firmware.name - else ""; -} diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix deleted file mode 100644 index 8b74db5df44d..000000000000 --- a/pkgs/misc/sane-backends/snapshot.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, fetchgit, hotplugSupport ? true, libusb ? null, gt68xxFirmware ? null }: -let - firmware = gt68xxFirmware { inherit fetchurl; }; -in -assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"); - -stdenv.mkDerivation { - name = "sane-backends-1.0.22.git20121123"; - - src = fetchurl { - url = "http://www.sane-project.org/snapshots/sane-backends-git20121123.tar.gz"; - sha256 = "d13a8c9e85af52f7be2e45c70cb93a76ec04b76e7fc983809e7d70389b6e7ae5"; - }; - - udevSupport = hotplugSupport; - - buildInputs = if libusb != null then [libusb] else []; - - postInstall = '' - if test "$udevSupport" = "1"; then - mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules - fi - ''; - - preInstall = - if gt68xxFirmware != null then - "mkdir -p \${out}/share/sane/gt68xx ; ln -s " + firmware.fw + - " \${out}/share/sane/gt68xx/" + firmware.name - else ""; -} diff --git a/pkgs/misc/sane-front/default.nix b/pkgs/misc/sane-front/default.nix deleted file mode 100644 index 9427d17ac648..000000000000 --- a/pkgs/misc/sane-front/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{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"; - }; - - preConfigure = '' - sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c - ''; - - 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 deleted file mode 100644 index 8dd99c3c74d0..000000000000 --- a/pkgs/misc/xsane/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, saneBackends, saneFrontends, - libX11, gtk, pkgconfig, libpng, libusb ? null}: -stdenv.mkDerivation { - name = "xsane-0.998"; - - src = fetchurl { - url = http://www.xsane.org/download/xsane-0.998.tar.gz; - sha256 = "0vn2cj85ijgp2v2j2h9xpqmg2jwlbxmwyb88kxhjjakqay02ybm3"; - }; - - preConfigure = '' - sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c - ''; - - buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ] ++ - (if (libusb != null) then [libusb] else []); - - meta = { - homepage = http://www.sane-project.org/; - description = "Graphical scanning frontend for sane"; - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} |