Commit 506a00b6 authored by Bouke van der Bijl's avatar Bouke van der Bijl
Browse files

meshoptimizer: fix cmakeFlags for optional dependencies 

At some point in the last few months the flags were changed and webp was
added.

Also bump the basis_universal dependency
parent 8ed887b9

pkgs/by-name/me/meshoptimizer/package.nix

+5 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  cmake,

  libwebp,

  nix-update-script,

}:
@@ -10,8 +11,8 @@ let 
  basis_universal = fetchFromGitHub {

    owner = "zeux";

    repo = "basis_universal";

    rev = "8903f6d69849fd782b72a551a4dd04a264434e20";

    hash = "sha256-o3dCxAAkpMoNkvkM7qD75cPn/obDc/fJ8u7KLPm1G6g=";

    rev = "88e813c46b3ff42e56ef947b3fa11eeee7a504b0";

    hash = "sha256-8SQhORPPLBeynlRWjpkXxleo5pgkNmEIjcXbptuo8es=";

  };

in

stdenv.mkDerivation rec {
@@ -34,7 +35,8 @@ stdenv.mkDerivation rec { 


  cmakeFlags = [

    "-DMESHOPT_BUILD_GLTFPACK=ON"

    "-DMESHOPT_BASISU_PATH=${basis_universal}"

    "-DMESHOPT_GLTFPACK_BASISU_PATH=${basis_universal}"

    "-DMESHOPT_GLTFPACK_LIBWEBP_PATH=${libwebp.src}"

  ]

  ++ lib.optional (!stdenv.hostPlatform.isStatic) "-DMESHOPT_BUILD_SHARED_LIBS:BOOL=ON";