diff --git a/crates/cli/build.rs b/crates/cli/build.rs deleted file mode 100644 index 5d171b71cf..0000000000 --- a/crates/cli/build.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn main() { - // workaround for issue https://github.com/NixOS/nixpkgs/issues/166205 . This println can be removed when this issue is fixed. Upgrading to LLVM 14 could also fix this issue. - // also see https://github.com/NixOS/nixpkgs/pull/181485 - #[cfg(all(target_os = "macos", target_arch = "aarch64"))] - println!("cargo:rustc-link-lib=c++abi") -} diff --git a/flake.lock b/flake.lock index eb92a746c7..9557dd4607 100644 --- a/flake.lock +++ b/flake.lock @@ -59,17 +59,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702900294, - "narHash": "sha256-pt7sSoJYNw3n8YtXw0Z/Nnr6/PfY2YrjDvqboErXnRM=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "886c9aee6ca9324e127f9c2c4e6f68c2641c8256", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" } }, diff --git a/flake.nix b/flake.nix index c08d2be327..b8e952c3f9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Roc flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?rev=886c9aee6ca9324e127f9c2c4e6f68c2641c8256"; + nixpkgs.url = "github:nixos/nixpkgs?rev=fd281bd6b7d3e32ddfa399853946f782553163b5"; # rust from nixpkgs has some libc problems, this is patched in the rust-overlay rust-overlay = {