Bump nixpkgs (fixing override errors in godot.nix).

SimulaVR · Jul 8, 2024 · 1c220b1 · 1c220b1
1 parent 70f0979
commit 1c220b1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/godot.nix b/godot.nix
@@ -24,10 +24,20 @@ let
  };
  stdenvRes = if devBuild then (keepDebugInfo stdenv) else stdenv;
 
- xwayland-dev = xwayland.override { stdenv = stdenvRes; };
- libxcb-dev = xorg.libxcb.override { stdenv = stdenvRes; };
- wayland-dev = wayland.override { stdenv = stdenvRes; };
- wayland-protocols-dev = wayland-protocols.override { stdenv = stdenvRes; };
+ xwayland-dev = xwayland.overrideAttrs (oldAttrs: {
+ stdenv = stdenvRes;
+ });
+ libxcb-dev = xorg.libxcb.overrideAttrs (oldAttrs: {
+ stdenv = stdenvRes;
+ });
+ wayland-dev = wayland.overrideAttrs (oldAttrs: {
+ stdenv = stdenvRes;
+ });
+ wayland-protocols-dev = wayland-protocols.overrideAttrs (oldAttrs: {
+ stdenv = stdenvRes;
+ });
+
+
 
  libxcb-errors = import ../wlroots/libxcb-errors/libxcb-errors.nix { stdenv = stdenv; pkg-config=pkg-config; autoreconfHook = autoreconfHook; xorg = xorg; libbsd = libbsd; python310 = python310; lib = lib; };
 
@@ -54,7 +64,7 @@ in stdenv.mkDerivation rec {
 
  src = ./.;
 
- nativeBuildInputs = [ scons pkgconfig ];
+ nativeBuildInputs = [ scons pkg-config ];
 
  buildInputs = [
  libX11 libXcursor libXinerama libXrandr libXrender

diff --git a/thirdparty/vhacd/inc/vhacdICHull.h b/thirdparty/vhacd/inc/vhacdICHull.h
@@ -17,6 +17,7 @@
 #define VHACD_ICHULL_H
 #include "vhacdManifoldMesh.h"
 #include "vhacdVector.h"
+#include <cstdint>
 
 namespace VHACD {
 //! Incremental Convex Hull algorithm (cf. http://cs.smith.edu/~orourke/books/ftp.html ).