git.iko.soy/helix
on master help sign in
Fix build on aarch64-darwin (#1789)
e529ca1Johann Dahm
flake.lock+15−16
compare with master
unifiedsplit
@@ -25,11 +25,11 @@
25 ]
25 ]
26 },
26 },
27 "locked": {
27 "locked": {
28− "lastModified": 1646667754,
28+ "lastModified": 1650900878,
29− "narHash": "sha256-LahZHvCC3UVzGQ55iWDRZkuDssXl1rYgqgScrPV9S38=",
29+ "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=",
30 "owner": "numtide",
30 "owner": "numtide",
31 "repo": "devshell",
31 "repo": "devshell",
32− "rev": "59fbe1dfc0de8c3332957c16998a7d16dff365d8",
32+ "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733",
33 "type": "github"
33 "type": "github"
34 },
34 },
35 "original": {
35 "original": {
@@ -75,16 +75,15 @@
75 ]
75 ]
76 },
76 },
77 "locked": {
77 "locked": {
78− "lastModified": 1646710334,
78+ "lastModified": 1651609988,
79− "narHash": "sha256-eLBcDgcbOUfeH4k6SEW5a5v0PTp2KNCn+5ZXIoWGYww=",
79+ "narHash": "sha256-oMjBD+noDmqTs3p31S+YES0zo0LTZ8GNe8klIre5NXQ=",
80 "owner": "nix-community",
80 "owner": "nix-community",
81 "repo": "dream2nix",
81 "repo": "dream2nix",
82− "rev": "5dcfbfd3b60ce0208b894c1bdea00e2bdf80ca6a",
82+ "rev": "6672d1f3d966c4d1e36ae66d156c0b1caec62dac",
83 "type": "github"
83 "type": "github"
84 },
84 },
85 "original": {
85 "original": {
86 "owner": "nix-community",
86 "owner": "nix-community",
87− "ref": "main",
88 "repo": "dream2nix",
87 "repo": "dream2nix",
89 "type": "github"
88 "type": "github"
90 }
89 }
@@ -131,11 +130,11 @@
131 ]
130 ]
132 },
131 },
133 "locked": {
132 "locked": {
134− "lastModified": 1646766572,
133+ "lastModified": 1651610406,
135− "narHash": "sha256-DV3+zxvAIKsMHsHedJKYFsracvFyLKpFQqurUBR86oY=",
134+ "narHash": "sha256-VrVAvivU3Bx0JPI6c8rDsEgfJUftOA9LOiuYMMVYseE=",
136 "owner": "yusdacra",
135 "owner": "yusdacra",
137 "repo": "nix-cargo-integration",
136 "repo": "nix-cargo-integration",
138− "rev": "3a3f47f43ba486b7554164a698c8dfc5a38624ce",
137+ "rev": "d812e9a68fd7144d309b6b86876713759e5aaf7f",
139 "type": "github"
138 "type": "github"
140 },
139 },
141 "original": {
140 "original": {
@@ -146,11 +145,11 @@
146 },
145 },
147 "nixpkgs": {
146 "nixpkgs": {
148 "locked": {
147 "locked": {
149− "lastModified": 1646497237,
148+ "lastModified": 1651558728,
150− "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
149+ "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=",
151 "owner": "nixos",
150 "owner": "nixos",
152 "repo": "nixpkgs",
151 "repo": "nixpkgs",
153− "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
152+ "rev": "cbe587c735b734405f56803e267820ee1559e6c1",
154 "type": "github"
153 "type": "github"
155 },
154 },
156 "original": {
155 "original": {
@@ -175,11 +174,11 @@
175 ]
174 ]
176 },
175 },
177 "locked": {
176 "locked": {
178− "lastModified": 1646792695,
177+ "lastModified": 1651545993,
179− "narHash": "sha256-2drCXIKIQnJMlTZbcCfuHZAh+iPcdlRkCqtZnA6MHLY=",
178+ "narHash": "sha256-+Qc553XIjn9/P2YpcTsL1nIG9hpLfBT9UMAhw0PkM3E=",
180 "owner": "oxalica",
179 "owner": "oxalica",
181 "repo": "rust-overlay",
180 "repo": "rust-overlay",
182− "rev": "7f599870402c8d2a5806086c8ee0f2d92b175c54",
181+ "rev": "8aeb9a75d2d52700ca987559de9859ef6fe38970",
183 "type": "github"
182 "type": "github"
184 },
183 },
185 "original": {
184 "original": {
flake.nix+2−1
@@ -25,6 +25,7 @@
25 package = "helix";
25 package = "helix";
26 };
26 };
27 overrides = {
27 overrides = {
28+ cCompiler = common: if common.pkgs.stdenv.isLinux then common.pkgs.gcc else common.pkgs.clang;
28 crateOverrides = common: _: {
29 crateOverrides = common: _: {
29 helix-term = prev:
30 helix-term = prev:
30 let
31 let
@@ -57,7 +58,7 @@
57 env = prev.env ++ [
58 env = prev.env ++ [
58 { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
59 { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
59 { name = "RUST_BACKTRACE"; value = "1"; }
60 { 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 ""; }
61 ];
62 ];
62 };
63 };
63 };
64 };