libhwy: 0.15.0 -> 1.0.2
This commit is contained in:
parent
2d7e0f330a
commit
7328b78fb5
|
@ -1,33 +1,23 @@
|
|||
{ lib, stdenv, cmake, ninja, gtest, fetchpatch, fetchFromGitHub }:
|
||||
{ lib, stdenv, cmake, ninja, gtest, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libhwy";
|
||||
version = "0.15.0";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "highway";
|
||||
rev = version;
|
||||
sha256 = "sha256-v2HyyHtBydr7QiI83DW1yRv2kWjUOGxFT6mmdrN9XPo=";
|
||||
hash = "sha256-CHzDLzOnu/QfejWiRKE9I5UUyRxoEooNtYVe8FQwu7c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove on next release
|
||||
# https://github.com/google/highway/issues/460
|
||||
(fetchpatch {
|
||||
name = "hwy-add-missing-includes.patch";
|
||||
url = "https://github.com/google/highway/commit/8ccab40c2f931aca6004d175eec342cc60f6baec.patch";
|
||||
sha256 = "sha256-wlp5gIvK2+OlKtsZwxq/pXTbESkUtimHXaYDjcBzmQ0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
# Required for case-insensitive filesystems ("BUILD" exists)
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
cmakeFlags = let
|
||||
libExt = stdenv.hostPlatform.extensions.library;
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
in [
|
||||
"-GNinja"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
|
@ -37,6 +27,8 @@ stdenv.mkDerivation rec {
|
|||
"-DGTEST_INCLUDE_DIR=${lib.getDev gtest}/include"
|
||||
"-DGTEST_LIBRARY=${lib.getLib gtest}/lib/libgtest${libExt}"
|
||||
"-DGTEST_MAIN_LIBRARY=${lib.getLib gtest}/lib/libgtest_main${libExt}"
|
||||
] ++ lib.optionals stdenv.hostPlatform.isAarch32 [
|
||||
"-DHWY_CMAKE_ARM7=ON"
|
||||
];
|
||||
|
||||
# hydra's darwin machines run into https://github.com/libjxl/libjxl/issues/408
|
||||
|
|
Loading…
Reference in a new issue