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: 6a9995279553
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e371763f969
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 2, 2020

  1. xow: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b036be7 View commit details

  2. acsccid: fix build 

    It was using libusb-compat instead of libusb1, and the former no longer propagates the latter.
    @jtojnar
    jtojnar committed Apr 2, 2020
    Copy the full SHA
    1e37176 View commit details
Showing with 36 additions and 8 deletions.
  1. +2 −2 pkgs/misc/drivers/xow/default.nix
  2. +34 −6 pkgs/tools/security/acsccid/default.nix
4 changes: 2 additions & 2 deletions pkgs/misc/drivers/xow/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libusb }:
{ stdenv, fetchFromGitHub, libusb1 }:

stdenv.mkDerivation rec {
pname = "xow";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
"SYSDDIR=${placeholder ''out''}/lib/systemd/system"
];
enableParallelBuilding = true;
buildInputs = [ libusb ];
buildInputs = [ libusb1 ];

meta = with stdenv.lib; {
homepage = "https://github.com/medusalix/xow";
40 changes: 34 additions & 6 deletions pkgs/tools/security/acsccid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }:
{ stdenv
, fetchFromGitHub
, autoconf
, automake
, libtool
, gettext
, flex
, perl
, pkgconfig
, pcsclite
, libusb1
, libiconv
}:

stdenv.mkDerivation rec {
version = "1.1.8";
@@ -11,11 +23,28 @@ stdenv.mkDerivation rec {
sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3";
};

doCheck = true;
nativeBuildInputs = [
pkgconfig
autoconf
automake
libtool
gettext
flex
perl
];

buildInputs = [
pcsclite
libusb1
] ++ stdenv.lib.optionals stdenv.isDarwin [
libiconv
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
configureFlags = [
"--enable-usbdropdir=${placeholder "out"}/pcsc/drivers"
];

doCheck = true;

postPatch = ''
sed -e s_/bin/echo_echo_g -i src/Makefile.am
@@ -29,7 +58,6 @@ stdenv.mkDerivation rec {
autoheader
automake --force-missing --add-missing
autoconf
configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers"
'';

meta = with stdenv.lib; {