diff options
| author | John Soo <john.soo@arista.com> | 2022-10-30 10:16:05 -0700 |
|---|---|---|
| committer | John Soo <john.soo@arista.com> | 2022-10-30 10:22:20 -0700 |
| commit | f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e (patch) | |
| tree | 081c778702ddd0cde6e5bffc83731a701a1927ce /pkgs/servers/nosql | |
| parent | b594ac0d726e58f1d9c4353fbee7af70de646dc5 (diff) | |
| download | nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.tar nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.tar.gz nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.tar.bz2 nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.tar.lz nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.tar.xz nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.tar.zst nixpkgs-f5bab1e08332366b4c80c5ab5f7d7f5e7d1a8d3e.zip | |
arangodb: no warning when defaulting target arch
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 7db4c434cdf..c4498087da3 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -18,26 +18,19 @@ }: let - pname = "arangodb"; - - default_arch = - if gcc10Stdenv.isx86_64 + defaultTargetArchitecture = + if gcc10Stdenv.targetPlatform.isx86 then "haswell" - else if gcc10Stdenv.isAarch64 - then "zen" - else "none"; + else "core"; - target_arch = + targetArch = if isNull targetArchitecture - then - lib.warn - "${pname} target architecture not specified, choosing ${default_arch}" - default_arch + then defaultTargetArchitecture else targetArchitecture; in gcc10Stdenv.mkDerivation rec { - inherit pname; + pname = "arangodb"; version = "3.10.0"; src = fetchFromGitHub { @@ -71,7 +64,7 @@ gcc10Stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=RelWithDebInfo" # avoid reading /proc/cpuinfo for feature detection - "-DTARGET_ARCHITECTURE=${target_arch}" + "-DTARGET_ARCHITECTURE=${targetArch}" ]; meta = with lib; { |