roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-07-07 07:26:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into del-unused-deps

Browse Source
This commit is contained in:
Anton-4 2024-04-10 13:45:39 +02:00 committed by GitHub
commit 6442c8b81f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cli/build.rs
View File

@ -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")
}

8
flake.lock
View File

@ -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"
}
},

2
flake.nix
View File

@ -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 = {