colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ngt: use stdenv.hostPlatform.avxSupport, cleanup

Browse Source
This commit is contained in:
Sandro Jäckel 2021-01-04 10:59:04 +01:00
parent 174267e601
commit 9932103ead
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/ngt/default.nix
View File

@ -1,8 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages, enableAVX ? false }:
{ stdenv
, fetchFromGitHub
, cmake
, llvmPackages
, enableAVX ? stdenv.hostPlatform.avxSupport
}:
stdenv.mkDerivation rec {
pname = "NGT";
version = "v1.12.3-alpha";
nativeBuildInputs = [ cmake ];
src = fetchFromGitHub {
owner = "yahoojapan";
@ -11,11 +16,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ llvmPackages.openmp ];
NIX_ENFORCE_NO_NATIVE=! enableAVX;
__AVX2__ = if enableAVX then 1 else 0;
enableParallelBuilding = true;
NIX_ENFORCE_NO_NATIVE = ! enableAVX;
__AVX2__ = if enableAVX then 1 else 0;
meta = with stdenv.lib; {
homepage = "https://github.com/yahoojapan/NGT";

2
pkgs/top-level/all-packages.nix
View File

@ -23450,7 +23450,7 @@ in
nedit = callPackage ../applications/editors/nedit { };
ngt = callPackage ../development/libraries/ngt { enableAVX = false; };
ngt = callPackage ../development/libraries/ngt { };
nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };