Joshua Yanovski
e55b541bcc
Revert "Merge branch 'yusdacra/chore/nix' into 'master'"
...
This reverts merge request !2951
2022-09-08 08:33:35 +00:00
Yusuf Bera Ertan
cdfb2ae040
build(nix): fix recompilation issues and improve build overhead
2022-09-07 02:42:37 +03:00
Yusuf Bera Ertan
511922baa5
build(nix): use correct linker in main derivation compile
2022-09-04 16:46:45 +03:00
Yusuf Bera Ertan
960aac307d
build(nix): refactor flake with new nci
2022-09-04 01:26:34 +03:00
Yusuf Bera Ertan
558f6be222
build(nix): remove unused stuff
2022-09-03 17:37:38 +03:00
Yusuf Bera Ertan
8014730d64
build(nix): refactor some code
2022-09-03 16:51:26 +03:00
Yusuf Bera Ertan
149763d54a
build(nix): add missing libraries for voxygen
2022-09-03 16:39:44 +03:00
Yusuf Bera Ertan
2af2b34d84
build: allow common to read git version information at runtime
2022-09-03 16:26:10 +03:00
Yusuf Bera Ertan
999984d15a
build(nix): refactor, dont pass git hash and tag
2022-09-03 16:00:11 +03:00
Yusuf Bera Ertan
12fb3254de
build(nix): add missing library for voxygen
2022-09-03 15:20:27 +03:00
Yusuf Bera Ertan
8d3b8f444b
build(nix): disable check for server cli
2022-09-03 08:00:06 +03:00
Yusuf Bera Ertan
19021e6d80
build(nix): add missing library for voxygen
2022-09-03 07:25:45 +03:00
Yusuf Bera Ertan
7a2d647400
build(nix): wrap veloren-voxygen in wrapper derivation
2022-09-03 07:12:18 +03:00
Yusuf Bera Ertan
1ca6ebdda0
build(nix): add missing library for voxygen
2022-09-03 03:34:10 +03:00
Yusuf Bera Ertan
d64417b41a
build(nix): wrap packages with assets in another derivation
2022-09-03 03:00:08 +03:00
Yusuf Bera Ertan
b442b016a6
build(nix): add source filtering for server-cli, use mold for server-cli too
2022-09-03 01:57:24 +03:00
Yusuf Bera Ertan
5bf1a0267f
build(nix): add source filtering for voxygen
2022-09-02 23:12:36 +03:00
Yusuf Bera Ertan
1c7b781b9e
build(nix): dont check dependencies derivation
2022-09-02 21:32:53 +03:00
Yusuf Bera Ertan
32d0da0539
fix: append config correctly
2022-09-02 21:13:58 +03:00
Yusuf Bera Ertan
c6bac19fe4
build(nix): use clang
2022-09-02 21:13:58 +03:00
Yusuf Bera Ertan
8dba530131
build(nix): use mold linker
2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
5b901d9775
build(nix): update flake lock, fix stuff
2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
0ffffa8496
build(nix): fix file path for substitute
2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
2afcc7195b
build(nix): fix lib not found error
2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
a0b7446f58
build(nix): format nix files, fix git lfs error
2022-09-02 21:13:57 +03:00
Yusuf Bera Ertan
b9586673d5
build(nix): update flake to use latest nix-cargo-integration
2022-09-02 21:13:56 +03:00
Yusuf Bera Ertan
521b2bf46b
build(nix): remove useless override (upstreamed), fix crate name
2021-08-03 17:45:41 +03:00
Yusuf Bera Ertan
055a46e3aa
build(nix): use default-publish for release builds of voxygen
2021-07-05 05:06:41 +03:00
Yusuf Bera Ertan
b8249cc64c
build(nix): fix audio resource patching
2021-06-27 23:23:01 +03:00
Yusuf Bera Ertan
81bc3d1966
build(nix): fix git ref not found and git lfs check
2021-06-19 22:05:22 +03:00
Yusuf Bera Ertan
e27a6fcaa1
build(nix): switch back to master branch nix-cargo-integration, use defaultOutputs
2021-06-13 19:33:38 +03:00
Yusuf Bera Ertan
27216d9a5e
build(nix): dont try to compile the recipe_graphviz binary
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
ffad3a5f66
build(nix): dont try to compile i18n-check binary
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
fd480fdfbc
build(nix): fix shaderc lib
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
faf5b3fc9c
chore(deps): update nix flake deps
2021-06-13 19:29:28 +03:00
Yusuf Bera Ertan
57bfe95939
chore(deps): update nix flake deps
2021-05-04 11:57:14 +03:00
Yusuf Bera Ertan
685f4971ac
build(nix): switch to crate2nix
2021-04-27 05:18:12 +03:00
Yusuf Bera Ertan
09a6d708b5
build(nix): make voxygen debug package and app defaults
2021-04-17 21:37:59 +03:00
Yusuf Bera Ertan
62844d816a
build(nix): switch to nix-cargo-integration
2021-04-17 21:37:57 +03:00
Yusuf Bera Ertan
e9a7ff7dd7
build(nix): switch to naersk
2021-03-23 16:02:47 +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