TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix build on aarch64-darwin (#1789)

Browse source 
Co-authored-by: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
This commit is contained in:
Johann Dahm 2022-05-04 00:32:44 +02:00 committed by GitHub
parent d2b1add1f4
commit e529ca1b92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
flake.lock
View file

@ -25,11 +25,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1646667754, "lastModified": 1650900878,
"narHash": "sha256-LahZHvCC3UVzGQ55iWDRZkuDssXl1rYgqgScrPV9S38=", "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "59fbe1dfc0de8c3332957c16998a7d16dff365d8", "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -75,16 +75,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1646710334, "lastModified": 1651609988,
"narHash": "sha256-eLBcDgcbOUfeH4k6SEW5a5v0PTp2KNCn+5ZXIoWGYww=", "narHash": "sha256-oMjBD+noDmqTs3p31S+YES0zo0LTZ8GNe8klIre5NXQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "5dcfbfd3b60ce0208b894c1bdea00e2bdf80ca6a", "rev": "6672d1f3d966c4d1e36ae66d156c0b1caec62dac",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "main",
"repo": "dream2nix", "repo": "dream2nix",
"type": "github" "type": "github"
} }
@ -131,11 +130,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1646766572, "lastModified": 1651610406,
"narHash": "sha256-DV3+zxvAIKsMHsHedJKYFsracvFyLKpFQqurUBR86oY=", "narHash": "sha256-VrVAvivU3Bx0JPI6c8rDsEgfJUftOA9LOiuYMMVYseE=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "3a3f47f43ba486b7554164a698c8dfc5a38624ce", "rev": "d812e9a68fd7144d309b6b86876713759e5aaf7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +145,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1646497237, "lastModified": 1651558728,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", "rev": "cbe587c735b734405f56803e267820ee1559e6c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1646792695, "lastModified": 1651545993,
"narHash": "sha256-2drCXIKIQnJMlTZbcCfuHZAh+iPcdlRkCqtZnA6MHLY=", "narHash": "sha256-+Qc553XIjn9/P2YpcTsL1nIG9hpLfBT9UMAhw0PkM3E=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7f599870402c8d2a5806086c8ee0f2d92b175c54", "rev": "8aeb9a75d2d52700ca987559de9859ef6fe38970",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -25,6 +25,7 @@
package = "helix"; package = "helix";
}; };
overrides = { overrides = {
cCompiler = common: if common.pkgs.stdenv.isLinux then common.pkgs.gcc else common.pkgs.clang;
crateOverrides = common: _: { crateOverrides = common: _: {
helix-term = prev: helix-term = prev:
let let
@ -57,7 +58,7 @@
env = prev.env ++ [ env = prev.env ++ [
{ name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; } { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
{ name = "RUST_BACKTRACE"; value = "1"; } { name = "RUST_BACKTRACE"; value = "1"; }
{ name = "RUSTFLAGS"; value = "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"; } { 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 ""; }
]; ];
}; };
}; };