Revert "Merge pull request #11826 from DeterminateSystems/revert-11804"

This reverts commit aeffdeffc8, reversing
changes made to 723fdeb4f1.

src/libexpr/local.mk

@@ -1,50 +0,0 @@
-libraries += libexpr
-
-libexpr_NAME = libnixexpr
-
-libexpr_DIR := $(d)
-
-libexpr_SOURCES := \
-  $(wildcard $(d)/*.cc) \
-  $(wildcard $(d)/value/*.cc) \
-  $(wildcard $(d)/primops/*.cc) \
-  $(d)/lexer-tab.cc \
-  $(d)/parser-tab.cc
-# Not just for this library itself, but also for downstream libraries using this library
-
-INCLUDE_libexpr := -I $(d)
-
-libexpr_CXXFLAGS += \
-	$(INCLUDE_libutil) $(INCLUDE_libstore) $(INCLUDE_libfetchers) $(INCLUDE_libexpr) \
-	-DGC_THREADS
-
-libexpr_LIBS = libutil libstore libfetchers
-
-libexpr_LDFLAGS += -lboost_context $(THREAD_LDFLAGS)
-ifdef HOST_LINUX
-  libexpr_LDFLAGS += -ldl
-endif
-
-# The dependency on libgc must be propagated (i.e. meaning that
-# programs/libraries that use libexpr must explicitly pass -lgc),
-# because inline functions in libexpr's header files call libgc.
-libexpr_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS)
-
-libexpr_ORDER_AFTER := $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh
-
-$(d)/parser-tab.cc $(d)/parser-tab.hh: $(d)/parser.y
-	$(trace-gen) bison -v -o $(libexpr_DIR)/parser-tab.cc $< -d
-
-$(d)/lexer-tab.cc $(d)/lexer-tab.hh: $(d)/lexer.l
-	$(trace-gen) flex --outfile $(libexpr_DIR)/lexer-tab.cc --header-file=$(libexpr_DIR)/lexer-tab.hh $<
-
-clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexer-tab.hh
-
-$(eval $(call install-file-in, $(buildprefix)$(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644))
-
-$(foreach i, $(wildcard src/libexpr/value/*.hh), \
-  $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644)))
-
-$(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh
-
-$(d)/eval.cc: $(d)/primops/derivation.nix.gen.hh $(d)/fetchurl.nix.gen.hh $(d)/call-flake.nix.gen.hh

src/libexpr/nix-expr.pc.in

@@ -1,10 +0,0 @@
-prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Nix
-Description: Nix Package Manager
-Version: @PACKAGE_VERSION@
-Requires: nix-store bdw-gc
-Libs: -L${libdir} -lnixexpr
-Cflags: -I${includedir}/nix -std=c++2a

src/libexpr/package.nix

@@ -71,6 +71,10 @@ mkMesonLibrary (finalAttrs: {
     nix-util
     nix-store
     nix-fetchers
+  ] ++ finalAttrs.passthru.externalPropagatedBuildInputs;
+
+  # Hack for sake of the dev shell
+  passthru.externalPropagatedBuildInputs = [
     boost
     nlohmann_json
   ] ++ lib.optional enableGC boehmgc;