From 3f94eff79c7131c3bec8480a181a729bc7f8a8bd Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 12:28:27 +0100 Subject: [PATCH 1/2] vassal: set mainProgram --- pkgs/games/vassal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index fd3df36bdb51..4e8277b4592d 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.unix; + mainProgram = "vassal"; }; } From 60a23dd32cf249a136aa7037fbe4035f28247196 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 25 Jan 2023 12:28:48 +0100 Subject: [PATCH 2/2] vassal: add wrapGAppsHook Fixes the file picker --- pkgs/games/vassal/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 4e8277b4592d..2f69d1e15647 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: +{ lib +, stdenv +, fetchzip +, glib +, jre +, makeWrapper +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "VASSAL"; @@ -9,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-WTYMbVtAciscnBzR4uHmVVXpuge53e32uLmUF8/w6I0="; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + glib + ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; installPhase = '' runHook preInstall