From 6dca7c9e88aa560faa0e9220fe12f6941dcf7ed1 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 16 Aug 2023 11:06:14 +0300 Subject: [PATCH] path-of-building: slight refactor to make automated updates work + cleanups --- pkgs/games/path-of-building/default.nix | 77 +++++++++++++------------ 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index ab48a12c8b35..06a5f8e2a114 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -1,11 +1,39 @@ -{ stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }: +{ stdenv, lib, fetchFromGitHub, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }: let - dataVersion = "2.31.1"; - frontendVersion = "unstable-2023-04-09"; + data = stdenv.mkDerivation(finalAttrs: { + pname = "path-of-building-data"; + version = "2.31.1"; + + src = fetchFromGitHub { + owner = "PathOfBuildingCommunity"; + repo = "PathOfBuilding"; + rev = "v${finalAttrs.version}"; + hash = "sha256-K/u8NYUv4U/XgGP/LkYMRzwmw1LFn25OW6bmvqqRpVQ="; + }; + + nativeBuildInputs = [ unzip ]; + + buildCommand = '' + # I have absolutely no idea how this file is generated + # and I don't think I want to know. The Flatpak also does this. + unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua + + # Install the actual data + cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out + + # Pretend this is an official build so we don't get the ugly "dev mode" warning + substituteInPlace $out/manifest.xml --replace ' $out/src/UpdateCheck.lua + ''; + }); in stdenv.mkDerivation { pname = "path-of-building"; - version = "${dataVersion}-${frontendVersion}"; + version = "${data.version}-unstable-2023-04-09"; src = fetchFromGitHub { owner = "ernstp"; @@ -14,36 +42,8 @@ stdenv.mkDerivation { hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk="; }; - data = runCommand "path-of-building-data" { - src = fetchFromGitHub { - owner = "PathOfBuildingCommunity"; - repo = "PathOfBuilding"; - rev = "v${dataVersion}"; - hash = "sha256-K/u8NYUv4U/XgGP/LkYMRzwmw1LFn25OW6bmvqqRpVQ="; - }; - - nativeBuildInputs = [ unzip ]; - } - '' - # I have absolutely no idea how this file is generated - # and I don't think I want to know. The Flatpak also does this. - unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua - - # Install the actual data - cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out - - # Pretend this is an official build so we don't get the ugly "dev mode" warning - substituteInPlace $out/manifest.xml --replace ' $out/src/UpdateCheck.lua - ''; - nativeBuildInputs = [ meson ninja pkg-config qttools wrapQtAppsHook ]; buildInputs = [ qtbase luajit luajit.pkgs.lua-curl ]; - dontWrapQtApps = true; installPhase = '' runHook preInstall @@ -51,13 +51,16 @@ stdenv.mkDerivation { runHook postInstall ''; - postFixup = '' - wrapQtApp $out/bin/pobfrontend \ - --set LUA_PATH "$LUA_PATH" \ - --set LUA_CPATH "$LUA_CPATH" \ - --chdir "$data" + preFixup = '' + qtWrapperArgs+=( + --set LUA_PATH "$LUA_PATH" + --set LUA_CPATH "$LUA_CPATH" + --chdir "${data}" + ) ''; + passthru.data = data; + meta = { description = "Offline build planner for Path of Exile"; homepage = "https://pathofbuilding.community/";