git.iko.soy/helix
on master help sign in
Fix build on aarch64-darwin (#1789)

Co-authored-by: Yusuf Bera Ertan <y.bera003.06@protonmail.com>

commite529ca1b92ac03fe1e4386756ee5811212ce96bd authorJohann Dahm <johann.dahm@gmail.com> dateWed 4 May 2022, 00:32 (4 years ago) parentd2b1add
2 files changed+17−17
compare with master
unifiedsplit
flake.lock+15−16 flake.nix+2−1
flake.lock+15−16
@@ -25,11 +25,11 @@
2525 ]
2626 },
2727 "locked": {
28− "lastModified": 1646667754,
29− "narHash": "sha256-LahZHvCC3UVzGQ55iWDRZkuDssXl1rYgqgScrPV9S38=",
28+ "lastModified": 1650900878,
29+ "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=",
3030 "owner": "numtide",
3131 "repo": "devshell",
32− "rev": "59fbe1dfc0de8c3332957c16998a7d16dff365d8",
32+ "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733",
3333 "type": "github"
3434 },
3535 "original": {
@@ -75,16 +75,15 @@
7575 ]
7676 },
7777 "locked": {
78− "lastModified": 1646710334,
79− "narHash": "sha256-eLBcDgcbOUfeH4k6SEW5a5v0PTp2KNCn+5ZXIoWGYww=",
78+ "lastModified": 1651609988,
79+ "narHash": "sha256-oMjBD+noDmqTs3p31S+YES0zo0LTZ8GNe8klIre5NXQ=",
8080 "owner": "nix-community",
8181 "repo": "dream2nix",
82− "rev": "5dcfbfd3b60ce0208b894c1bdea00e2bdf80ca6a",
82+ "rev": "6672d1f3d966c4d1e36ae66d156c0b1caec62dac",
8383 "type": "github"
8484 },
8585 "original": {
8686 "owner": "nix-community",
87− "ref": "main",
8887 "repo": "dream2nix",
8988 "type": "github"
9089 }
@@ -131,11 +130,11 @@
131130 ]
132131 },
133132 "locked": {
134− "lastModified": 1646766572,
135− "narHash": "sha256-DV3+zxvAIKsMHsHedJKYFsracvFyLKpFQqurUBR86oY=",
133+ "lastModified": 1651610406,
134+ "narHash": "sha256-VrVAvivU3Bx0JPI6c8rDsEgfJUftOA9LOiuYMMVYseE=",
136135 "owner": "yusdacra",
137136 "repo": "nix-cargo-integration",
138− "rev": "3a3f47f43ba486b7554164a698c8dfc5a38624ce",
137+ "rev": "d812e9a68fd7144d309b6b86876713759e5aaf7f",
139138 "type": "github"
140139 },
141140 "original": {
@@ -146,11 +145,11 @@
146145 },
147146 "nixpkgs": {
148147 "locked": {
149− "lastModified": 1646497237,
150− "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
148+ "lastModified": 1651558728,
149+ "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=",
151150 "owner": "nixos",
152151 "repo": "nixpkgs",
153− "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
152+ "rev": "cbe587c735b734405f56803e267820ee1559e6c1",
154153 "type": "github"
155154 },
156155 "original": {
@@ -175,11 +174,11 @@
175174 ]
176175 },
177176 "locked": {
178− "lastModified": 1646792695,
179− "narHash": "sha256-2drCXIKIQnJMlTZbcCfuHZAh+iPcdlRkCqtZnA6MHLY=",
177+ "lastModified": 1651545993,
178+ "narHash": "sha256-+Qc553XIjn9/P2YpcTsL1nIG9hpLfBT9UMAhw0PkM3E=",
180179 "owner": "oxalica",
181180 "repo": "rust-overlay",
182− "rev": "7f599870402c8d2a5806086c8ee0f2d92b175c54",
181+ "rev": "8aeb9a75d2d52700ca987559de9859ef6fe38970",
183182 "type": "github"
184183 },
185184 "original": {
flake.nix+2−1
@@ -25,6 +25,7 @@
2525 package = "helix";
2626 };
2727 overrides = {
28+ cCompiler = common: if common.pkgs.stdenv.isLinux then common.pkgs.gcc else common.pkgs.clang;
2829 crateOverrides = common: _: {
2930 helix-term = prev:
3031 let
@@ -57,7 +58,7 @@
5758 env = prev.env ++ [
5859 { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
5960 { name = "RUST_BACKTRACE"; value = "1"; }
60− { name = "RUSTFLAGS"; value = "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"; }
61+ { name = "RUSTFLAGS"; value = if common.pkgs.stdenv.isLinux then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment" else ""; }
6162 ];
6263 };
6364 };