From 3bf2d2b7fbd473231c21210305b0ee6309d72f74 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Tue, 29 Jun 2021 04:10:14 +0300 Subject: [PATCH] build(nix): use default-publish for release builds of voxygen --- flake.lock | 12 ++++++------ flake.nix | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e6a8e50c51..5711b914ee 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "rustOverlay": "rustOverlay" }, "locked": { - "lastModified": 1624760770, - "narHash": "sha256-6dVQ0B0DJf6BPGl49MA/V0QhEh8rky1TX2qaP/XWzpY=", + "lastModified": 1624860560, + "narHash": "sha256-Hv1gx9AKHq8VEEiXLOEKAJA3nY8HDtcqAf7D7+Vs540=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "89de4b1e831d6e8572e713fc3b3a016157f8c3ba", + "rev": "ed208b4e4e69e160c79b2b9519b1ea2bd689431e", "type": "github" }, "original": { @@ -62,11 +62,11 @@ "rustOverlay": { "flake": false, "locked": { - "lastModified": 1624760275, - "narHash": "sha256-GVHe1Pshxf56kpu1YDTH2zBYE6HkdT181EPqkTIijp4=", + "lastModified": 1624846612, + "narHash": "sha256-7xk8z+PXSXe0GMtmBXEattPhVAkMNefXL3WSgNhz0wI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "50c100eab4bf1cb9eb7a99ac1b8201fe9eb8a4e0", + "rev": "ca925c3f982e821c52a8629af37f105c2c90a91e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1534e358bd..b6d8c63207 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,10 @@ overrides = { build = common: prev: { runTests = !prev.release && prev.runTests; + rootFeatures = + if prev.release && common.cargoPkg.name == "veloren-voxygen" + then [ "default-publish" ] + else prev.rootFeatures; }; crateOverrides = common: prev: let