diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-04-29 16:05:20 -0400 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2024-05-10 00:57:39 -0700 |
| commit | f4b3bea79504451686a6a6abec02eecaefd6fe6e (patch) | |
| tree | 77db551b304da44cdcf12270fccffab3a0cb6efa /pkgs/development/tools/misc/usb-modeswitch | |
| parent | 254c34fc456672484b03cb8a6649ad8deabfe8ef (diff) | |
usb-modeswitch: fix cross compilation by using the correct pkg-config
Diffstat (limited to 'pkgs/development/tools/misc/usb-modeswitch')
| -rw-r--r-- | pkgs/development/tools/misc/usb-modeswitch/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/usb-modeswitch/pkg-config.patch | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 4f9dbe92d2b70..8451bead269e5 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 = '' 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 |