diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-04-05 15:58:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 15:58:33 +0800 |
| commit | 6de6aeb81d222c814ac79bdc013e5ffdd258f411 (patch) | |
| tree | cfea56d99924a870114f325f94142d3bbfb20372 | |
| parent | d7a16607e67d60c34a889c47a2116578edc593d7 (diff) | |
| parent | a48f50641c02de6e3555f853163f756c28a6ca83 (diff) | |
| download | nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.tar nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.tar.gz nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.tar.bz2 nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.tar.lz nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.tar.xz nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.tar.zst nixlib-6de6aeb81d222c814ac79bdc013e5ffdd258f411.zip | |
Merge pull request #38289 from r-ryantm/auto-update/lmdb
lmdb: 0.9.21 -> 0.9.22
| -rw-r--r-- | pkgs/development/libraries/lmdb/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/lmdb/hardcoded-compiler.patch | 26 |
2 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index d96b5ed6d520..0bb3a67d9502 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,17 +2,20 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.21"; + version = "0.9.22"; src = fetchFromGitHub { owner = "LMDB"; repo = "lmdb"; rev = "LMDB_${version}"; - sha256 = "026a6himvg3y4ssnccdbgr3c2pq3w2d47nayn05v512875z4f2w3"; + sha256 = "0lng4ra2qrbqcf8klvqp68qarha0z4bkqhhv8lhh45agsxyrhfkj"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; + patches = [ ./hardcoded-compiler.patch ]; + patchFlags = "-p3"; + outputs = [ "bin" "out" "dev" ]; makeFlags = [ "prefix=$(out)" "CC=cc" ] diff --git a/pkgs/development/libraries/lmdb/hardcoded-compiler.patch b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch new file mode 100644 index 000000000000..ddb247b7f113 --- /dev/null +++ b/pkgs/development/libraries/lmdb/hardcoded-compiler.patch @@ -0,0 +1,26 @@ +commit 029031a68873bc3784a8561bd8e049efbd34f9d0 (HEAD) +Author: Vladimír Čunát <vcunat@gmail.com> +Date: Sun Apr 1 11:05:31 2018 +0200 + + make: gcc -> $(CC) + +diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile +index f254511..612484e 100644 +--- a/libraries/liblmdb/Makefile ++++ b/libraries/liblmdb/Makefile +@@ -102,13 +102,13 @@ COV_OBJS=xmdb.o xmidl.o + + coverage: xmtest + for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \ +- gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ ++ $(CC) -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \ + rm -rf testdb; mkdir testdb; ./x$$j; done + gcov xmdb.c + gcov xmidl.c + + xmtest: mtest.o xmdb.o xmidl.o +- gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) ++ $(CC) -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS) + + xmdb.o: mdb.c lmdb.h midl.h + $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@ |