JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipad_charge, simple-scan: libusb{-compat -> 1}

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2015-12-17 16:41:57 +01:00
parent 1e3314718d
commit 535b4279c7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/simple-scan/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool { 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 let version = "3.19.3"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; 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 ]; vala ];
nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];

4
pkgs/tools/misc/ipad_charge/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libusb }: { stdenv, fetchFromGitHub, libusb1 }:
let version = "2015-02-03"; in let version = "2015-02-03"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
owner = "mkorenkov"; owner = "mkorenkov";
}; };
buildInputs = [ libusb ]; buildInputs = [ libusb1 ];
postPatch = '' postPatch = ''
substituteInPlace Makefile \ substituteInPlace Makefile \