git.iko.soy/typeable/nixpkgs
on master help sign in
civetweb: init at 1.11
commit15e8eebb6dffc03a4ca61db5118766abcb5e7836 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateThu 7 Mar 2019, 09:50 (8 years ago) parente5091de
3 files changed+98
pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch+55 pkgs/development/libraries/civetweb/default.nix+41 pkgs/top-level/all-packages.nix+2
pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patchnew file+55
@@ -0,0 +1,55 @@
1+From 06b2c6dd6439c01bfb5a4c7b0ec6909c349a66b1 Mon Sep 17 00:00:00 2001
2+From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
3+Date: Thu, 28 Feb 2019 16:25:49 +0100
4+Subject: [PATCH] allow setting paths in makefile
5+
6+and install headers and libs
7+---
8+ Makefile | 12 ++++++------
9+ 1 file changed, 6 insertions(+), 6 deletions(-)
10+
11+diff --git a/Makefile b/Makefile
12+index b507e2b0..d21e5c56 100644
13+--- a/Makefile
14++++ b/Makefile
15+@@ -19,13 +19,13 @@ BUILD_DIR = out
16+ # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
17+ PREFIX ?= /usr/local
18+ EXEC_PREFIX = $(PREFIX)
19+-BINDIR = $(EXEC_PREFIX)/bin
20++BINDIR ?= $(EXEC_PREFIX)/bin
21+ DATAROOTDIR = $(PREFIX)/share
22+ DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
23+ SYSCONFDIR = $(PREFIX)/etc
24+ HTMLDIR = $(DOCDIR)
25+-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
26+-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
27++INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include
28++LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib
29+
30+ # build tools
31+ MKDIR = mkdir -p
32+@@ -270,17 +270,17 @@ build: $(CPROG) $(CXXPROG)
33+ unit_test: $(UNIT_TEST_PROG)
34+
35+ ifeq ($(CAN_INSTALL),1)
36+-install: $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
37++install: install-headers install-slib $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
38+ install -d -m 755 "$(DOCDIR)"
39+ install -m 644 *.md "$(DOCDIR)"
40+ install -d -m 755 "$(BINDIR)"
41+ install -m 755 $(CPROG) "$(BINDIR)/"
42+
43+ install-headers:
44+- install -m 644 $(HEADERS) "$(INCLUDEDIR)"
45++ install -m 644 $(HEADERS) "$(INCLUDEDIR)/"
46+
47+ install-lib: lib$(CPROG).a
48+- install -m 644 $< "$(LIBDIR)"
49++ install -m 644 $< "$(LIBDIR)/"
50+
51+ install-slib: lib$(CPROG).so
52+ $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g'))
53+--
54+2.19.2
55+
pkgs/development/libraries/civetweb/default.nixnew file+41
@@ -0,0 +1,41 @@
1+{ stdenv
2+, fetchFromGitHub
3+}:
4+
5+stdenv.mkDerivation rec {
6+ pname = "civetweb";
7+ version = "1.11";
8+
9+ src = fetchFromGitHub {
10+ owner = pname;
11+ repo = pname;
12+ rev = "v${version}";
13+ sha256 = "sha256:1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv";
14+ };
15+
16+ makeFlags = [
17+ "WITH_CPP=1"
18+ "PREFIX=${placeholder "out"}"
19+ "LIBDIR=${placeholder "out"}/lib"
20+ "INCLUDEDIR=${placeholder "dev"}/include"
21+ ];
22+
23+ patches = [
24+ ./0001-allow-setting-paths-in-makefile.patch
25+ ];
26+
27+ strictDeps = true;
28+
29+ outputs = [ "out" "dev" ];
30+
31+ preInstall = ''
32+ mkdir -p $dev/include
33+ mkdir -p $out/lib
34+ '';
35+
36+ meta = {
37+ description = "Embedded C/C++ web server";
38+ homepage = https://github.com/civetweb/civetweb;
39+ license = [ stdenv.lib.licenses.mit ];
40+ };
41+}
pkgs/top-level/all-packages.nix+2
@@ -2091,6 +2091,8 @@ in
20912091
20922092 checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
20932093
2094+ civetweb = callPackage ../development/libraries/civetweb { };
2095+
20942096 ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };
20952097
20962098 clamav = callPackage ../tools/security/clamav { };