pcsc-cyberjack: minor cleanups #84866
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
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/update-error-usbdev-c3-error-error-neither-hal-nor-usb1-found/6638/4 |
|
@aszlig already fixed this, so this PR is now only the minor cleanups that were included as part of my fix. |
ofborg
bot
added
10.rebuild-darwin: 0
10.rebuild-linux: 1-10
10.rebuild-linux: 1
labels
peterhoeg
changed the title
aszlig
approved these changes
Apr 17, 2020
| @@ -1,25 +1,26 @@ | |||
| { stdenv, fetchurl, pkgconfig, libusb1, pcsclite }: | |||
| { stdenv, lib, fetchurl, pkgconfig, libusb1, pcsclite }: | |||
|
|
|||
| stdenv.mkDerivation rec { | |||
| pname = "pcsc-cyberjack"; | |||
| version = "3.99.5_SP12"; | |||
|
|
|||
| src = with stdenv.lib; let | |||
There was a problem hiding this comment.
Since you already brought lib into scope, I think it also makes sense to remove with stdenv.lib; everywhere and prefix the corresponding functions with lib..
|
@aszlig - just some minor cleanups left. Instead of trying to be clever with the version, just be specific. It's cleaner and easier to read. |
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.
Previously, pulling in libusb meant that you would get libusb1 as well as it was
propagated by libusb which meant that derivations incorrectly depending on
libusb when they should be depending on libusb1 would work.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)