diff options
| -rw-r--r-- | flake.lock | 31 | ||||
| -rw-r--r-- | flake.nix | 3 |
2 files changed, 17 insertions, 17 deletions
@@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1646667754, - "narHash": "sha256-LahZHvCC3UVzGQ55iWDRZkuDssXl1rYgqgScrPV9S38=", + "lastModified": 1650900878, + "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=", "owner": "numtide", "repo": "devshell", - "rev": "59fbe1dfc0de8c3332957c16998a7d16dff365d8", + "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733", "type": "github" }, "original": { @@ -75,16 +75,15 @@ ] }, "locked": { - "lastModified": 1646710334, - "narHash": "sha256-eLBcDgcbOUfeH4k6SEW5a5v0PTp2KNCn+5ZXIoWGYww=", + "lastModified": 1651609988, + "narHash": "sha256-oMjBD+noDmqTs3p31S+YES0zo0LTZ8GNe8klIre5NXQ=", "owner": "nix-community", "repo": "dream2nix", - "rev": "5dcfbfd3b60ce0208b894c1bdea00e2bdf80ca6a", + "rev": "6672d1f3d966c4d1e36ae66d156c0b1caec62dac", "type": "github" }, "original": { "owner": "nix-community", - "ref": "main", "repo": "dream2nix", "type": "github" } @@ -131,11 +130,11 @@ ] }, "locked": { - "lastModified": 1646766572, - "narHash": "sha256-DV3+zxvAIKsMHsHedJKYFsracvFyLKpFQqurUBR86oY=", + "lastModified": 1651610406, + "narHash": "sha256-VrVAvivU3Bx0JPI6c8rDsEgfJUftOA9LOiuYMMVYseE=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "3a3f47f43ba486b7554164a698c8dfc5a38624ce", + "rev": "d812e9a68fd7144d309b6b86876713759e5aaf7f", "type": "github" }, "original": { @@ -146,11 +145,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1646497237, - "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "lastModified": 1651558728, + "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "rev": "cbe587c735b734405f56803e267820ee1559e6c1", "type": "github" }, "original": { @@ -175,11 +174,11 @@ ] }, "locked": { - "lastModified": 1646792695, - "narHash": "sha256-2drCXIKIQnJMlTZbcCfuHZAh+iPcdlRkCqtZnA6MHLY=", + "lastModified": 1651545993, + "narHash": "sha256-+Qc553XIjn9/P2YpcTsL1nIG9hpLfBT9UMAhw0PkM3E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f599870402c8d2a5806086c8ee0f2d92b175c54", + "rev": "8aeb9a75d2d52700ca987559de9859ef6fe38970", "type": "github" }, "original": { @@ -25,6 +25,7 @@ package = "helix"; }; overrides = { + cCompiler = common: if common.pkgs.stdenv.isLinux then common.pkgs.gcc else common.pkgs.clang; crateOverrides = common: _: { helix-term = prev: let @@ -57,7 +58,7 @@ env = prev.env ++ [ { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; } { 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 ""; } ]; }; }; |