X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=09db75c5508d49d1bc10f66007149136ca0bcf7c;hb=HEAD;hp=cff0e1d8d482993620ba967df924f19f19027152;hpb=2a3283643ccf77b55d67c7a3f96d40576227499c;p=openwrt%2Fstaging%2Fhauke.git

diff --git a/Makefile b/Makefile
index cff0e1d8d4..9bdb03a443 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,9 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt dir
 
 world:
 
-DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep '/usr' -m 1)
+DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep -e '/usr' -e '/nix/store' -m 1)
+
+export ORIG_PATH:=$(if $(ORIG_PATH),$(ORIG_PATH),$(PATH))
 export PATH:=$(if $(STAGING_DIR),$(abspath $(STAGING_DIR)/../host/bin),$(TOPDIR)/staging_dir/host/bin):$(PATH)
 
 ifneq ($(OPENWRT_BUILD),1)