Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 876660fed983
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35ee15ded888
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 12, 2019

  1. epkowa: add support for network scanners (#60568)

    @booxter @veprbl
    booxter authored and veprbl committed Jun 12, 2019
    Copy the full SHA
    35ee15d View commit details
Showing with 31 additions and 1 deletion.
  1. +31 −1 pkgs/misc/drivers/epkowa/default.nix
32 changes: 31 additions & 1 deletion pkgs/misc/drivers/epkowa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ libusb,
sane-backends,
rpm, cpio,
getopt,
patchelf, gcc
patchelf, autoPatchelfHook, gcc
}:

let common_meta = {
@@ -161,6 +161,34 @@ let plugins = {

meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; };
};
network = stdenv.mkDerivation rec {
pname = "iscan-nt-bundle";
version = "1.0.0";
ntPluginVersion = "1.1.1-1";

buildInputs = [ stdenv.cc.cc.lib ];
nativeBuildInputs = [ autoPatchelfHook ];

src = fetchurl {
url = "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz";
sha256 = "1k3dmv4ml21k6mafvcvgfymb1acpcdxpvyrbfh2yf07jzmn5if4f";
};
installPhase = ''
cd plugins
${rpm}/bin/rpm2cpio iscan-network-nt-${ntPluginVersion}.x86_64.rpm | ${cpio}/bin/cpio -idmv
mkdir $out
cp -r usr/share $out
cp -r usr/lib64 $out/lib
mkdir $out/share/esci
'';
passthru = {
registrationCommand = "";
hw = "network";
};

meta = common_meta // { description = "iscan network plugin"; };
};
};
in

@@ -226,6 +254,8 @@ stdenv.mkDerivation rec {
cp backend/epkowa.conf $out/etc/sane.d
echo "epkowa" > $out/etc/sane.d/dll.conf
ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data
mkdir -p $out/lib/iscan
ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network
'';
postFixup = ''
# iscan-registry is a shell script requiring getopt