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

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

src/libutil/local.mk

@@ -1,44 +0,0 @@
-libraries += libutil
-
-libutil_NAME = libnixutil
-
-libutil_DIR := $(d)
-
-libutil_SOURCES := $(wildcard $(d)/*.cc $(d)/signature/*.cc)
-ifdef HOST_UNIX
-  libutil_SOURCES += $(wildcard $(d)/unix/*.cc)
-endif
-ifdef HOST_LINUX
-    libutil_SOURCES += $(wildcard $(d)/linux/*.cc)
-endif
-ifdef HOST_WINDOWS
-    libutil_SOURCES += $(wildcard $(d)/windows/*.cc)
-endif
-
-# Not just for this library itself, but also for downstream libraries using this library
-
-INCLUDE_libutil := -I $(d)
-ifdef HOST_UNIX
-  INCLUDE_libutil += -I $(d)/unix
-endif
-ifdef HOST_LINUX
-  INCLUDE_libutil += -I $(d)/linux
-endif
-ifdef HOST_WINDOWS
-  INCLUDE_libutil += -I $(d)/windows
-endif
-libutil_CXXFLAGS += $(INCLUDE_libutil)
-
-libutil_LDFLAGS += $(THREAD_LDFLAGS) $(LIBCURL_LIBS) $(SODIUM_LIBS) $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) $(LIBARCHIVE_LIBS) $(BOOST_LDFLAGS) -lboost_context
-
-$(foreach i, $(wildcard $(d)/args/*.hh), \
-  $(eval $(call install-file-in, $(i), $(includedir)/nix/args, 0644)))
-$(foreach i, $(wildcard $(d)/signature/*.hh), \
-  $(eval $(call install-file-in, $(i), $(includedir)/nix/signature, 0644)))
-
-
-ifeq ($(HAVE_LIBCPUID), 1)
-  libutil_LDFLAGS += -lcpuid
-endif
-
-$(eval $(call install-file-in, $(buildprefix)$(d)/nix-util.pc, $(libdir)/pkgconfig, 0644))

src/libutil/nix-util.pc.in

@@ -1,9 +0,0 @@
-prefix=@prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Nix
-Description: Nix Package Manager
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lnixutil
-Cflags: -I${includedir}/nix -std=c++2a