mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
build(nix): update flake lock, fix stuff
This commit is contained in:
Yusuf Bera Ertan
parent
99cb326e54
commit
5b901d9775
9176
dream2nix-packages/dream-lock.json
Normal file
9176
dream2nix-packages/dream-lock.json
Normal file
File diff suppressed because it is too large
Load Diff
71
flake.lock
71
flake.lock
@ -3,11 +3,11 @@
|
||||
"crane": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1644785799,
|
||||
"narHash": "sha256-VpAJO1L0XeBvtCuNGK4IDKp6ENHIpTrlaZT7yfBCvwo=",
|
||||
"lastModified": 1661875961,
|
||||
"narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "fc7a94f841347c88f2cb44217b2a3faa93e2a0b2",
|
||||
"rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -17,19 +17,13 @@
|
||||
}
|
||||
},
|
||||
"devshell": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1652861301,
|
||||
"narHash": "sha256-k7MboNn4YUoyKsyJMMnJh20jKQHoORn7F+KsWG4cxNo=",
|
||||
"lastModified": 1660811669,
|
||||
"narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "95713285f88af14cb96cb18430d478da7b064e93",
|
||||
"rev": "c2feacb46ee69949124c835419861143c4016fb5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -45,6 +39,10 @@
|
||||
"nixpkgs"
|
||||
],
|
||||
"crane": "crane",
|
||||
"devshell": [
|
||||
"nci",
|
||||
"devshell"
|
||||
],
|
||||
"flake-utils-pre-commit": [
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
@ -61,10 +59,6 @@
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
],
|
||||
"node2nix": [
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
],
|
||||
"poetry2nix": [
|
||||
"nci",
|
||||
"nixpkgs"
|
||||
@ -75,11 +69,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1652903532,
|
||||
"narHash": "sha256-lEDDZdgz053yryoj8AE0EldfDJSWNl/JIYOnL/cdods=",
|
||||
"lastModified": 1662083074,
|
||||
"narHash": "sha256-GL4/CLKPYUzkKD1l7oi2XB+vi3z4xGpCVLDdG3tRqvs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "dream2nix",
|
||||
"rev": "ce73e1a256a297ab056ef5389227474cd34c0518",
|
||||
"rev": "c6c039fcc6abdf4d828b940b576944a224cf8622",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -88,34 +82,19 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1642700792,
|
||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nci": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
"dream2nix": "dream2nix",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rustOverlay": "rustOverlay"
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1652903917,
|
||||
"narHash": "sha256-osCp4hN7jEONs494YtjNV2P16KPcb/zyxg74CYrConE=",
|
||||
"lastModified": 1662083103,
|
||||
"narHash": "sha256-Dal74nxD+w9hfT1cPQ7H8LxZIYMYlOI8UOLNrfFamLM=",
|
||||
"owner": "yusdacra",
|
||||
"repo": "nix-cargo-integration",
|
||||
"rev": "c634e01d11fab71c3e62050c59823ff8a55df84a",
|
||||
"rev": "df1352199d5dbf8d4c127ef60bfd458149230fd6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -126,11 +105,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1652659998,
|
||||
"narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=",
|
||||
"lastModified": 1662019588,
|
||||
"narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502",
|
||||
"rev": "2da64a81275b68fdad38af669afeda43d401e94b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -145,14 +124,14 @@
|
||||
"nci": "nci"
|
||||
}
|
||||
},
|
||||
"rustOverlay": {
|
||||
"rust-overlay": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1652841650,
|
||||
"narHash": "sha256-hp/WtX369mx38h/J7/q8A8piC/8XkzGMSW71JlXgzGM=",
|
||||
"lastModified": 1662001050,
|
||||
"narHash": "sha256-tduflWLNZ6C3Xz0eUHf5Cnnfl47Vgey2NUY5ZU9f/S4=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "65674e95c82955cda97f6c588d022e01fa72b976",
|
||||
"rev": "6f27501ff78beb62728cb292daca846fcab96c9e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
38
flake.nix
38
flake.nix
@ -10,6 +10,17 @@
|
||||
package = "veloren-voxygen";
|
||||
app = "veloren-voxygen";
|
||||
};
|
||||
perCrateOverrides = {
|
||||
veloren-voxygen = {
|
||||
packageMetadata = _: {
|
||||
features = rec {
|
||||
release = ["default-publish"];
|
||||
debug = release;
|
||||
test = release;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
overrides = {
|
||||
crates = common: prev: let
|
||||
pkgs = common.pkgs;
|
||||
@ -31,7 +42,7 @@
|
||||
|
||||
prettyRev = with sourceInfo; builtins.substring 0 8 rev + "/" + utils.dateTimeFormat lastModified;
|
||||
|
||||
tag = with sourceInfo;
|
||||
tag =
|
||||
if sourceInfo ? tag
|
||||
then sourceInfo.tag
|
||||
else "";
|
||||
@ -61,15 +72,37 @@
|
||||
NIX_GIT_TAG = tag;
|
||||
};
|
||||
veloren-voxygen = oldAttrs: {
|
||||
nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [pkgs.makeWrapper];
|
||||
inherit version;
|
||||
|
||||
buildInputs =
|
||||
(oldAttrs.buildInputs or [])
|
||||
++ (
|
||||
with pkgs; [
|
||||
alsa-lib
|
||||
libxkbcommon
|
||||
udev
|
||||
xorg.libxcb
|
||||
]
|
||||
);
|
||||
nativeBuildInputs =
|
||||
(oldAttrs.nativeBuildInputs or [])
|
||||
++ (with pkgs; [python3 makeWrapper]);
|
||||
|
||||
VELOREN_USERDATA_STRATEGY = "system";
|
||||
SHADERC_LIB_DIR = "${pkgs.shaderc.lib}/lib";
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
doCheck = false;
|
||||
|
||||
preConfigure = ''
|
||||
${oldAttrs.preConfigure or ""}
|
||||
substituteInPlace voxygen/src/audio/soundcache.rs \
|
||||
--replace \
|
||||
"../../../assets/voxygen/audio/null.ogg" \
|
||||
"${./assets/voxygen/audio/null.ogg}"
|
||||
'';
|
||||
postInstall = ''
|
||||
${oldAttrs.postInstall or ""}
|
||||
if [ -f $out/bin/veloren-voxygen ]; then
|
||||
wrapProgram $out/bin/veloren-voxygen \
|
||||
--set VELOREN_ASSETS ${veloren-assets} \
|
||||
@ -81,6 +114,7 @@
|
||||
nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [pkgs.makeWrapper];
|
||||
VELOREN_USERDATA_STRATEGY = "system";
|
||||
postInstall = ''
|
||||
${oldAttrs.postInstall or ""}
|
||||
if [ -f $out/bin/veloren-server-cli ]; then
|
||||
wrapProgram $out/bin/veloren-server-cli \
|
||||
--set VELOREN_ASSETS ${veloren-assets}
|
||||
|
||||
@ -19,7 +19,6 @@ It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild,
|
||||
This package includes the official client, Voxygen.
|
||||
"""
|
||||
runtimeLibs = ["libGL", "xorg.libX11", "xorg.libXcursor", "xorg.libXrandr", "xorg.libXi", "vulkan-loader", "vulkan-extension-layer"]
|
||||
buildInputs = ["xorg.libxcb"]
|
||||
|
||||
[features]
|
||||
hot-anim = ["anim/use-dyn-lib"]
|
||||
|
||||
Loading…
Reference in New Issue
Block a user