From 704d2dccb95cb63d8f36f7a97b4e7fd975762691 Mon Sep 17 00:00:00 2001 From: John Soo Date: Tue, 25 Oct 2022 12:02:23 -0700 Subject: [PATCH] arangodb: stdenvGcc10->stdenv since gcc 11+ is suggested --- pkgs/servers/nosql/arangodb/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index b4c5cda19594..e4b67f51fe54 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,4 +1,4 @@ -{ gcc10Stdenv +{ stdenv , git , lib , fetchFromGitHub @@ -12,9 +12,7 @@ , which }: -# Arango 3.10.0 officially only supports gcc11+, but seems to compile -# with 10 -gcc10Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "arangodb"; version = "3.10.0"; @@ -48,8 +46,8 @@ gcc10Stdenv.mkDerivation rec { "-DUSE_MAINTAINER_MODE=OFF" # avoid using builder's /proc/cpuinfo - "-DHAVE_SSE42=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" - "-DASM_OPTIMIZATIONS=${if gcc10Stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + "-DHAVE_SSE42=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" ]; meta = with lib; {