From 63baacc410f8f72dd6b8b779f9be8c907fa83b40 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:46:18 -0800 Subject: [PATCH] whatever --- flake.lock | 12 ++++++------ users/tao.nix | 2 +- users/tao/cargo.nix | 9 +++++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8ccd5f4..63eee2a 100644 --- a/flake.lock +++ b/flake.lock @@ -67,11 +67,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708526834, - "narHash": "sha256-dcE2cal0dLwomM977zsZpL/i9O3zloaMPkC4oor2yYc=", + "lastModified": 1708659443, + "narHash": "sha256-OULRHvT21UNDmGMYRWs782NHNc1BcrNqj3UVJkx7zP0=", "owner": "helix-editor", "repo": "helix", - "rev": "98ebeeebd8c7462409f82d34ff4ac0a7ae9116c7", + "rev": "b7b6f300841bb61d8833fee1c58d0e3670849b61", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1708615558, - "narHash": "sha256-Bt3gjUO81wIPLqm7qOz9f7fdimXkas2ReBQho7ldJOc=", + "lastModified": 1708650812, + "narHash": "sha256-2ewmMY9c2thujsAAmIuoIDp0HE8nIrtPRiwyajunkho=", "owner": "martinvonz", "repo": "jj", - "rev": "62f0cb8c3f03ade34e8862ba0cd600603fc4a91a", + "rev": "2f5ce9db892bcd60f9b0167bd1cca9e02fb9910e", "type": "github" }, "original": { diff --git a/users/tao.nix b/users/tao.nix index 184a8ed..1de0b94 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -6,7 +6,7 @@ # expressvpn # fractal # gh - # joshuto + joshuto # libftdi # libusb # mdbook diff --git a/users/tao/cargo.nix b/users/tao/cargo.nix index 1958ce2..f4e308c 100644 --- a/users/tao/cargo.nix +++ b/users/tao/cargo.nix @@ -4,7 +4,7 @@ rr = "run --release" [build] - target = "x86_64-unknown-linux-musl" + target = "x86_64-unknown-linux-gnu" rustc-wrapper = "${pkgs.sccache}/bin/sccache" rustflags = ["-Z", "threads=8"] @@ -27,7 +27,12 @@ codegen-units = 1 lto = "fat" - [target.x86-unknown-linux-musl] + # [target.x86-unknown-linux-musl] + # # linker = "musl-gcc" + # linker = "clang" + # rustflag = ["-C", "target-cpu=native", "link-arg=ld-path=${pkgs.mold}/bin/mold"] + + [target.x86-unknown-linux-gnu] # linker = "musl-gcc" linker = "clang" rustflag = ["-C", "target-cpu=native", "link-arg=ld-path=${pkgs.mold}/bin/mold"]