Commit Graph

14 Commits

Author SHA1 Message Date
Yusuf Bera Ertan
e9a7ff7dd7
build(nix): switch to naersk 2021-03-23 16:02:47 +03:00
Ludvig Böklin
0b4aeb5794 Cargo.nix override instead of requiring manual intervention 2020-12-17 12:15:47 +01:00
Yusuf Bera Ertan
9ecaba8552
nix: workaround an issue with crate2nix, change some errors to be more clear 2020-12-12 21:14:29 +03:00
Yusuf Bera Ertan
c5a7db06fb
nix: better instructions for nixGL 2020-12-12 17:53:48 +03:00
Yusuf Bera Ertan
64812249ad
nix: add bundle subcommand usage 2020-12-12 17:10:55 +03:00
Yusuf Bera Ertan
9e62a6c322
nix: update README, remove nixGL selection from dev shell (which also removes envrc-nvidia), update envrc to be used by both flakes, tidy up some stuff 2020-12-12 17:10:54 +03:00
Ludvig Böklin
3f498522db flake-compat (unify flake and non-flake build process/environment)
The only user-facing changes is the process for version pinning, which will be
slightly less convenient without access to the `nix flake` feature. This is
justified by it rarely being necessary, for the benefit of relying on an
upcoming built-in nix feature rather than a non-standard third-party tool.

- deprecate `niv` for version pinning
- legacy nix now uses the flake via `flake-compat`
  - remove `sources.{nix,json}` (versions now pinned in `flake.lock`)
  - move contents of `nix/default.nix` to `nix/veloren.nix`
  - make `nix-build nix/default.nix` produce the same output as `flake build`
  - move contents of `nix/shell.nix` into `nix/devShell.nix`
  - make `nix-shell nix/shell.nix` produce the same environment as `flake develop`
- Move `tag` parameter into `sourceInfo`
- Tidy up and autoformat with `nixpkgs-fmt`
- update README to reflect new usage
- revert input versions to match those previously specified in nix/sources.json
2020-12-11 12:00:04 +00:00
Yusuf Bera Ertan
eb730f6904
nix: add .desktop file to veloren-voxygen derivation, update deps and other minor stuff 2020-12-01 00:15:18 +03:00
Yusuf Bera Ertan
bb1a481d1d
nix: add envrc and envrc-nvidia file for auto dev env setup with direnv 2020-11-30 23:51:05 +03:00
Yusuf Bera Ertan
3c7d682361
nix: dont run git-lfs shell hook if its already initialized, add experimental nix-bundle bundling command, add nixGL to shell.nix for non-nixos users, switch to nixpkgs-fmt for formatting, update niv deps and many other minor improvements 2020-11-30 03:48:00 +03:00
Yusuf Bera Ertan
e0096a1a91
nix: auto setup cachix cache, do git-lfs check in Nix, link assets dir directly (no assets package) and other minor improvements 2020-11-29 02:02:46 +03:00
Yusuf Bera Ertan
62d34422fe
fix and improve nix build: actually output a proper veloren voxygen package now 2020-11-25 02:00:50 +03:00
Yusuf Bera Ertan
f6bdc57f1b
nix: Add nixfmt package to shell.nix, update readme 2020-06-23 20:51:32 +03:00
Yusuf Bera Ertan
6cfa48e82e
nix: Switch to crate2nix, and niv for dependency management 2020-06-23 20:51:32 +03:00