diff --git a/nix/Cargo.nix b/nix/Cargo.nix index 09520ab874..06670d2e69 100644 --- a/nix/Cargo.nix +++ b/nix/Cargo.nix @@ -3205,6 +3205,41 @@ rec { features = { "default" = [ "use_std" ]; }; resolvedDefaultFeatures = [ "default" "use_std" ]; }; + "enum-iterator" = rec { + crateName = "enum-iterator"; + version = "0.6.0"; + edition = "2018"; + sha256 = "1mxq9fds22paikg2c95kxkpxych4p1n3yzhca4q7fz8rl4hn76n7"; + authors = [ "Stephane Raux " ]; + dependencies = [{ + name = "enum-iterator-derive"; + packageId = "enum-iterator-derive"; + }]; + + }; + "enum-iterator-derive" = rec { + crateName = "enum-iterator-derive"; + version = "0.6.0"; + edition = "2018"; + sha256 = "01pc15d8l0ayrjv7xjjx1lxw2vypvlawcvc9ax7pdp60ywqsm50y"; + procMacro = true; + authors = [ "Stephane Raux " ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2 1.0.18"; + } + { + name = "quote"; + packageId = "quote 1.0.7"; + } + { + name = "syn"; + packageId = "syn 1.0.33"; + } + ]; + + }; "error-chain" = rec { crateName = "error-chain"; version = "0.12.2"; @@ -11920,7 +11955,7 @@ rec { }; "veloren-chat-cli" = rec { crateName = "veloren-chat-cli"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; crateBin = [{ name = "veloren-chat-cli"; @@ -11958,7 +11993,7 @@ rec { }; "veloren-client" = rec { crateName = "veloren-client"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; src = lib.cleanSourceWith { filter = sourceFilter; @@ -12036,7 +12071,7 @@ rec { }; "veloren-common" = rec { crateName = "veloren-common"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; src = lib.cleanSourceWith { filter = sourceFilter; @@ -12064,6 +12099,10 @@ rec { name = "dot_vox"; packageId = "dot_vox"; } + { + name = "enum-iterator"; + packageId = "enum-iterator"; + } { name = "find_folder"; packageId = "find_folder"; @@ -12154,7 +12193,7 @@ rec { }; "veloren-server" = rec { crateName = "veloren-server"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; src = lib.cleanSourceWith { filter = sourceFilter; @@ -12293,7 +12332,7 @@ rec { }; "veloren-server-cli" = rec { crateName = "veloren-server-cli"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; crateBin = [{ name = "veloren-server-cli"; @@ -12336,7 +12375,7 @@ rec { }; "veloren-voxygen" = rec { crateName = "veloren-voxygen"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; crateBin = [{ name = "veloren-voxygen"; @@ -12595,7 +12634,7 @@ rec { }; "veloren-voxygen-anim" = rec { crateName = "veloren-voxygen-anim"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; src = lib.cleanSourceWith { filter = sourceFilter; @@ -12661,7 +12700,7 @@ rec { }; "veloren-world" = rec { crateName = "veloren-world"; - version = "0.6.0"; + version = "0.7.0"; edition = "2018"; src = lib.cleanSourceWith { filter = sourceFilter; diff --git a/nix/default.nix b/nix/default.nix index 0d071cac35..c88cdbf1d1 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -37,7 +37,13 @@ let alsa-sys = _: { buildInputs = [ pkg-config alsaLib ]; }; veloren-common = _: { NIX_GIT_HASH = gitHash; }; veloren-network = _: { buildInputs = [ pkg-config openssl ]; }; - veloren-voxygen = _: { buildInputs = [ atk cairo glib gtk3 pango ]; }; + veloren-voxygen = _: { + buildInputs = [ atk cairo glib gtk3 pango ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/veloren-voxygen --set LD_LIBRARY_PATH ${xorg.libX11}/lib + ''; + }; }; inherit release pkgs nixpkgs; }; diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix index a4aae61026..589c053b89 100644 --- a/nix/nixpkgs.nix +++ b/nix/nixpkgs.nix @@ -7,7 +7,7 @@ let }; rustChannel = mozPkgs.rustChannelOf { rustToolchain = ../rust-toolchain; - sha256 = "sha256-18R7sZfLGmtYkz24jUaq268fJO2A71p+dWvGm4DgqEw="; + sha256 = "sha256-hKjJt5RAI9cf55orvwGEkOXIGOaySX5dD2aj3iQ/IDs="; }; in import nixpkgs { inherit system; diff --git a/nix/sources.json b/nix/sources.json index 5f855119b0..85a56797f4 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "kolloch", "repo": "crate2nix", - "rev": "ee584740abafedac0b0700c8bf5a32c1c76dd86e", - "sha256": "0ixbrrmriwjmwj94s8frmb7yl34mqnnyxd0imqipnvz8l98ma986", + "rev": "602223cdd990f17edb7bd8587a44b9ba76f8e886", + "sha256": "1jvhi0crlgr570365w024xysx3myflaj0yqk8hx4nz6agvrpb0hc", "type": "tarball", - "url": "https://github.com/kolloch/crate2nix/archive/ee584740abafedac0b0700c8bf5a32c1c76dd86e.tar.gz", + "url": "https://github.com/kolloch/crate2nix/archive/602223cdd990f17edb7bd8587a44b9ba76f8e886.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgsMoz": {