diff options
Diffstat (limited to 'pkgs/development/tools/misc/usb-modeswitch')
| -rw-r--r-- | pkgs/development/tools/misc/usb-modeswitch/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch | 14 |
2 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 4f9dbe92d2b70..0befa7aac9d67 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "18wbbxc5cfsmikba0msdvd5qlaga27b32nhrzicyd9mdddp265f2"; }; - patches = [ ./configurable-usb-modeswitch.patch ]; + patches = [ + ./configurable-usb-modeswitch.patch + ./pkg-config.patch + ]; # Remove attempts to write to /etc and /var/lib. postPatch = '' @@ -38,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper ]; meta = with lib; { - description = "A mode switching tool for controlling 'multi-mode' USB devices"; + description = "Mode switching tool for controlling 'multi-mode' USB devices"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch b/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch new file mode 100644 index 0000000000000..052ab7543eb92 --- /dev/null +++ b/pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index 9aa7356..c5f2a87 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,8 @@ PROG = usb_modeswitch + VERS = 2.6.0 + CC ?= gcc + CFLAGS += -Wall -Wno-deprecated-declarations +-LIBS = `pkg-config --libs --cflags libusb-1.0` ++PKG_CONFIG ?= pkg-config ++LIBS = `$(PKG_CONFIG) --libs --cflags libusb-1.0` + RM = /bin/rm -f + OBJS = usb_modeswitch.c + PREFIX = $(DESTDIR)/usr |