about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/ngt
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-01-15 10:30:44 +0000
committerAlyssa Ross <hi@alyssa.is>2021-01-15 10:30:44 +0000
commite0794be8a0d11e90461e5a9c85012a36b93ec976 (patch)
treeefd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/ngt
parent3538874082ded7647b1ccec0343c7c1e882cfef3 (diff)
parent1a57d96edd156958b12782e8c8b6a374142a7248 (diff)
downloadnixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar
nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz
nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2
nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz
nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz
nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst
nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ngt')
-rw-r--r--nixpkgs/pkgs/development/libraries/ngt/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ngt/default.nix b/nixpkgs/pkgs/development/libraries/ngt/default.nix
index 114a438ea1ee..977bdf9afe37 100644
--- a/nixpkgs/pkgs/development/libraries/ngt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ngt/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, llvmPackages, enableAVX ? false }:
 stdenv.mkDerivation rec {
   pname = "NGT";
-  version = "v1.8.4";
+  version = "v1.12.3-alpha";
   nativeBuildInputs = [ cmake ];
+
   src = fetchFromGitHub {
     owner = "yahoojapan";
     repo = "NGT";
-    rev = version;
-    sha256 = "f2019e7916b81f8aeabc57d682904c8447776bf9ba94525d20265b329aa43eb5";
+    rev = "29c88ff6cd5824d3196986d1f50b834565b6c9dd";
+    sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
   };
 
+  buildInputs = [ llvmPackages.openmp ];
+  NIX_ENFORCE_NO_NATIVE=! enableAVX;
+  __AVX2__ = if enableAVX then 1 else 0;
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {