diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-17 16:41:57 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-12-17 23:51:43 +0100 |
| commit | 535b4279c7aafe68971527fe2ddb0dd8d2b70ec9 (patch) | |
| tree | c84bb7fb5895d004a804bae89f97714d1f21e9be | |
| parent | 1e3314718debdd69aac8d333525c7a3f20e2f0b6 (diff) | |
| download | nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.tar nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.tar.gz nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.tar.bz2 nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.tar.lz nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.tar.xz nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.tar.zst nixlib-535b4279c7aafe68971527fe2ddb0dd8d2b70ec9.zip | |
ipad_charge, simple-scan: libusb{-compat -> 1}
| -rw-r--r-- | pkgs/applications/graphics/simple-scan/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/ipad_charge/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index c205c2a3f1c7..c169d262fb63 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: +, libusb1, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }: let version = "3.19.3"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; - buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends + buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 saneBackends vala ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix index df987ed86c1c..73fee38cbf20 100644 --- a/pkgs/tools/misc/ipad_charge/default.nix +++ b/pkgs/tools/misc/ipad_charge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb }: +{ stdenv, fetchFromGitHub, libusb1 }: let version = "2015-02-03"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "mkorenkov"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb1 ]; postPatch = '' substituteInPlace Makefile \ |