From 0da416f82019357c5e83d660a5adfa3d017546d5 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Tue, 10 Aug 2021 16:01:00 -0700 Subject: [PATCH] 15f4d4f follow up * libstore: `bz2` should not be linked * libutil: `zlib.h` should not be included Signed-off-by: Pamplemousse --- src/libstore/local.mk | 2 +- src/libutil/compression.cc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libstore/local.mk b/src/libstore/local.mk index 2fc334a82..44316f542 100644 --- a/src/libstore/local.mk +++ b/src/libstore/local.mk @@ -8,7 +8,7 @@ libstore_SOURCES := $(wildcard $(d)/*.cc $(d)/builtins/*.cc $(d)/build/*.cc) libstore_LIBS = libutil -libstore_LDFLAGS = $(SQLITE3_LIBS) -lbz2 $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread +libstore_LDFLAGS = $(SQLITE3_LIBS) $(LIBCURL_LIBS) $(SODIUM_LIBS) -pthread ifdef HOST_LINUX libstore_LDFLAGS += -ldl endif diff --git a/src/libutil/compression.cc b/src/libutil/compression.cc index 7e725cae1..d26f68fde 100644 --- a/src/libutil/compression.cc +++ b/src/libutil/compression.cc @@ -12,8 +12,6 @@ #include #include -#include - #include namespace nix {