diff --git a/flake.lock b/flake.lock index a14e238db4a..de2b75f0538 100644 --- a/flake.lock +++ b/flake.lock @@ -20,18 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759735786, - "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index b4cb649589f..84fedd7167e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,11 @@ description = "Wasmer Webassembly runtime"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; - flakeutils.url = "github:numtide/flake-utils"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + flakeutils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, flakeutils }: @@ -43,7 +46,8 @@ libffi cmake ninja - webkitgtk_4_0 + webkitgtk_4_1 + # Rust tooling @@ -75,7 +79,7 @@ shellHook = '' export LLVM_SYS_211_PREFIX="${pkgs.llvmPackages_21.llvm.dev}" export LIBCLANG_PATH="${pkgs.llvmPackages_21.libclang.lib}/lib" - export PKG_CONFIG_PATH="${pkgs.webkitgtk_4_0.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="${pkgs.webkitgtk_4_1.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" export LIBRARY_PATH="${pkgs.llvmPackages_21.compiler-rt-libc}/lib/linux:$LIBRARY_PATH" export LD_LIBRARY_PATH="${pkgs.llvmPackages_21.compiler-rt-libc}/lib/linux:$LD_LIBRARY_PATH" export BINDGEN_EXTRA_CLANG_ARGS="$(