From 681d8b4fb9952fd4d1e3c29403c18ce274fb5c45 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 8 Nov 2022 06:35:02 -0800 Subject: [PATCH 1/2] arangod: tidy maintainers, preConfigure Missed code review feedback. Co-authored-by: Sandro --- pkgs/servers/nosql/arangodb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index afb84fe70e321..075ba6663586c 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -49,7 +49,10 @@ gcc10Stdenv.mkDerivation rec { # prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory" dontFixCmake = true; NIX_CFLAGS_COMPILE = "-Wno-error"; - preConfigure = "patchShebangs utils"; + + preConfigure = '' + patchShebangs utils + ''; postPatch = '' sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi @@ -76,6 +79,6 @@ gcc10Stdenv.mkDerivation rec { description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.flosse maintainers.jsoo1 ]; + maintainers = with maintainers; [ flosse jsoo1 ]; }; } From ccc4875b09fddc49c81a63d1e577727339fe62bf Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 8 Nov 2022 07:20:34 -0800 Subject: [PATCH 2/2] arangodb: reorder preConfigure after postPatch --- pkgs/servers/nosql/arangodb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 075ba6663586c..9b2ac7a5567f2 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -50,10 +50,6 @@ gcc10Stdenv.mkDerivation rec { dontFixCmake = true; NIX_CFLAGS_COMPILE = "-Wno-error"; - preConfigure = '' - patchShebangs utils - ''; - postPatch = '' sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi @@ -62,6 +58,10 @@ gcc10Stdenv.mkDerivation rec { substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" ''; + preConfigure = '' + patchShebangs utils + ''; + cmakeFlags = [ "-DUSE_MAINTAINER_MODE=OFF" "-DUSE_GOOGLE_TESTS=OFF"