ngt: 1.8.4 -> 1.12.3-alpha (#101790)

Co-authored-by: Sandro <[email protected]>
NixOS · Dec 8, 2020 · 7c20dfa · 7c20dfa
1 parent 06ed343
commit 7c20dfa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/pkgs/development/libraries/ngt/default.nix b/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; {

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -23102,7 +23102,7 @@ in
 
   nedit = callPackage ../applications/editors/nedit { };
 
-  ngt = callPackage ../development/libraries/ngt { };
+  ngt = callPackage ../development/libraries/ngt { enableAVX = false; };
 
   nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };