Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(nix): update flake lock, fix stuff

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2022-08-30 19:42:23 +03:00
parent 99cb326e54
commit 5b901d9775
No known key found for this signature in database
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 9237 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9176
dream2nix-packages/dream-lock.json Normal file
View File

File diff suppressed because it is too large Load Diff

71
flake.lock
View File

@ -3,11 +3,11 @@
"crane": { "crane": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1644785799, "lastModified": 1661875961,
"narHash": "sha256-VpAJO1L0XeBvtCuNGK4IDKp6ENHIpTrlaZT7yfBCvwo=", "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "fc7a94f841347c88f2cb44217b2a3faa93e2a0b2", "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,19 +17,13 @@
} }
}, },
"devshell": { "devshell": {
"inputs": { "flake": false,
"flake-utils": "flake-utils",
"nixpkgs": [
"nci",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1652861301, "lastModified": 1660811669,
"narHash": "sha256-k7MboNn4YUoyKsyJMMnJh20jKQHoORn7F+KsWG4cxNo=", "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "95713285f88af14cb96cb18430d478da7b064e93", "rev": "c2feacb46ee69949124c835419861143c4016fb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -45,6 +39,10 @@
"nixpkgs" "nixpkgs"
], ],
"crane": "crane", "crane": "crane",
"devshell": [
"nci",
"devshell"
],
"flake-utils-pre-commit": [ "flake-utils-pre-commit": [
"nci", "nci",
"nixpkgs" "nixpkgs"
@ -61,10 +59,6 @@
"nci", "nci",
"nixpkgs" "nixpkgs"
], ],
"node2nix": [
"nci",
"nixpkgs"
],
"poetry2nix": [ "poetry2nix": [
"nci", "nci",
"nixpkgs" "nixpkgs"
@ -75,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1652903532, "lastModified": 1662083074,
"narHash": "sha256-lEDDZdgz053yryoj8AE0EldfDJSWNl/JIYOnL/cdods=", "narHash": "sha256-GL4/CLKPYUzkKD1l7oi2XB+vi3z4xGpCVLDdG3tRqvs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "ce73e1a256a297ab056ef5389227474cd34c0518", "rev": "c6c039fcc6abdf4d828b940b576944a224cf8622",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,34 +82,19 @@
"type": "github" "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": { "nci": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"dream2nix": "dream2nix", "dream2nix": "dream2nix",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rustOverlay": "rustOverlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1652903917, "lastModified": 1662083103,
"narHash": "sha256-osCp4hN7jEONs494YtjNV2P16KPcb/zyxg74CYrConE=", "narHash": "sha256-Dal74nxD+w9hfT1cPQ7H8LxZIYMYlOI8UOLNrfFamLM=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "c634e01d11fab71c3e62050c59823ff8a55df84a", "rev": "df1352199d5dbf8d4c127ef60bfd458149230fd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +105,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1652659998, "lastModified": 1662019588,
"narHash": "sha256-FqNrXC1EE6U2RACwXBlsAvg1lqQGLYpuYb6+W3DL9vA=", "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d7db1b9e4cf1ee075a9f52e5c36f7b9f4207502", "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,14 +124,14 @@
"nci": "nci" "nci": "nci"
} }
}, },
"rustOverlay": { "rust-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1652841650, "lastModified": 1662001050,
"narHash": "sha256-hp/WtX369mx38h/J7/q8A8piC/8XkzGMSW71JlXgzGM=", "narHash": "sha256-tduflWLNZ6C3Xz0eUHf5Cnnfl47Vgey2NUY5ZU9f/S4=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "65674e95c82955cda97f6c588d022e01fa72b976", "rev": "6f27501ff78beb62728cb292daca846fcab96c9e",
"type": "github" "type": "github"
}, },
"original": { "original": {

38
flake.nix
View File

@ -10,6 +10,17 @@
package = "veloren-voxygen"; package = "veloren-voxygen";
app = "veloren-voxygen"; app = "veloren-voxygen";
}; };
perCrateOverrides = {
veloren-voxygen = {
packageMetadata = _: {
features = rec {
release = ["default-publish"];
debug = release;
test = release;
};
};
};
};
overrides = { overrides = {
crates = common: prev: let crates = common: prev: let
pkgs = common.pkgs; pkgs = common.pkgs;
@ -31,7 +42,7 @@
prettyRev = with sourceInfo; builtins.substring 0 8 rev + "/" + utils.dateTimeFormat lastModified; prettyRev = with sourceInfo; builtins.substring 0 8 rev + "/" + utils.dateTimeFormat lastModified;
tag = with sourceInfo; tag =
if sourceInfo ? tag if sourceInfo ? tag
then sourceInfo.tag then sourceInfo.tag
else ""; else "";
@ -61,15 +72,37 @@
NIX_GIT_TAG = tag; NIX_GIT_TAG = tag;
}; };
veloren-voxygen = oldAttrs: { 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"; VELOREN_USERDATA_STRATEGY = "system";
SHADERC_LIB_DIR = "${pkgs.shaderc.lib}/lib";
dontUseCmakeConfigure = true;
doCheck = false;
preConfigure = '' preConfigure = ''
${oldAttrs.preConfigure or ""}
substituteInPlace voxygen/src/audio/soundcache.rs \ substituteInPlace voxygen/src/audio/soundcache.rs \
--replace \ --replace \
"../../../assets/voxygen/audio/null.ogg" \ "../../../assets/voxygen/audio/null.ogg" \
"${./assets/voxygen/audio/null.ogg}" "${./assets/voxygen/audio/null.ogg}"
''; '';
postInstall = '' postInstall = ''
${oldAttrs.postInstall or ""}
if [ -f $out/bin/veloren-voxygen ]; then if [ -f $out/bin/veloren-voxygen ]; then
wrapProgram $out/bin/veloren-voxygen \ wrapProgram $out/bin/veloren-voxygen \
--set VELOREN_ASSETS ${veloren-assets} \ --set VELOREN_ASSETS ${veloren-assets} \
@ -81,6 +114,7 @@
nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [pkgs.makeWrapper]; nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [pkgs.makeWrapper];
VELOREN_USERDATA_STRATEGY = "system"; VELOREN_USERDATA_STRATEGY = "system";
postInstall = '' postInstall = ''
${oldAttrs.postInstall or ""}
if [ -f $out/bin/veloren-server-cli ]; then if [ -f $out/bin/veloren-server-cli ]; then
wrapProgram $out/bin/veloren-server-cli \ wrapProgram $out/bin/veloren-server-cli \
--set VELOREN_ASSETS ${veloren-assets} --set VELOREN_ASSETS ${veloren-assets}

1
voxygen/Cargo.toml
View File

@ -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. This package includes the official client, Voxygen.
""" """
runtimeLibs = ["libGL", "xorg.libX11", "xorg.libXcursor", "xorg.libXrandr", "xorg.libXi", "vulkan-loader", "vulkan-extension-layer"] runtimeLibs = ["libGL", "xorg.libX11", "xorg.libXcursor", "xorg.libXrandr", "xorg.libXi", "vulkan-loader", "vulkan-extension-layer"]
buildInputs = ["xorg.libxcb"]
[features] [features]
hot-anim = ["anim/use-dyn-lib"] hot-anim = ["anim/use-dyn-lib"]