epkowa: added Perfection V500 support #42436
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Nice ! I checked, the older plugin still works :) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index e0196701994..ca7ac4b4152 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -6,7 +6,7 @@ libxslt,
libusb,
sane-backends,
rpm, cpio,
-eject,
+getopt,
patchelf, gcc
}:
@@ -55,6 +55,7 @@ let plugins = {
'';
hw = "Perfection V500 Photo";
};
+ meta = common_meta // { description = "iscan esci x770 plugin for "+passthru.hw; };
};
f720 = stdenv.mkDerivation rec {
name = "iscan-gt-f720-bundle";
@@ -155,7 +156,7 @@ stdenv.mkDerivation rec {
'';
postFixup = ''
# iscan-registry is a shell script requiring getopt
- wrapProgram $out/bin/iscan-registry --prefix PATH : ${eject}/bin
+ wrapProgram $out/bin/iscan-registry --prefix PATH : ${getopt}/bin
registry=$out/bin/iscan-registry;
'' +
stdenv.lib.concatStrings (stdenv.lib.mapAttrsToList (name: value: ''The part about getopt seems to be due to a refactoring around utillinux (see ce8ce60) and the part about meta is because the plugin is unfree so specifying it explicitely is somewhat important. |
|
Thanks! I didn't retest it after rebasing to master. Hope it's OK now |
symphorien
approved these changes
Jun 24, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Add support for Epson Perfection V500 Photo
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)