From 0ca89abf6a8addee13c943791e8db3e083d055c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sun, 7 Apr 2024 18:55:21 -0400
Subject: [PATCH 1/2] liberation-circuit: general cleanup

---
 pkgs/games/liberation-circuit/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix
index 533391082034..8fb81c05d1c2 100644
--- a/pkgs/games/liberation-circuit/default.nix
+++ b/pkgs/games/liberation-circuit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liberation-circuit";
-  version = "unstable-2022-01-02";
+  version = "1.3-unstable-2022-01-02";
 
   src = fetchFromGitHub {
     owner = "linleyh";
-    repo = pname;
+    repo = "liberation-circuit";
     rev = "19e3363547793e931fd9419b61ebc2cd8e257714";
-    sha256 = "zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY=";
+    hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY=";
   };
 
   nativeBuildInputs = [ pkg-config makeWrapper ];
@@ -29,15 +29,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Real-time strategy game with programmable units";
     mainProgram = "liberation-circuit";
     longDescription = ''
-      Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C.
+      Escape from a hostile computer system!
+      Harvest data to create an armada of battle-processes to aid your escape!
+      Take command directly and play the game as an RTS, or use the game's built-in
+      editor and compiler to write your own unit AI in a simplified version of C.
     '';
     homepage = "https://linleyh.itch.io/liberation-circuit";
-    maintainers = with maintainers; [ emilytrau ];
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ emilytrau ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
   };
 }

From f68451b18ada0d77fc772b09a0f28f244d2289b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:22:31 -0500
Subject: [PATCH 2/2] liberation-circuit: fix wrapper for non-gnome
 environments

---
 pkgs/games/liberation-circuit/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix
index 8fb81c05d1c2..5df48282f26d 100644
--- a/pkgs/games/liberation-circuit/default.nix
+++ b/pkgs/games/liberation-circuit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, makeWrapper, allegro5, libGL }:
+{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "liberation-circuit";
@@ -11,16 +11,17 @@ stdenv.mkDerivation rec {
     hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY=";
   };
 
-  nativeBuildInputs = [ pkg-config makeWrapper ];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];
   buildInputs = [ allegro5 libGL ];
 
+  dontWrapGApps = true;
+
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/opt
     cp -r bin $out/opt/liberation-circuit
     chmod +x $out/opt/liberation-circuit/launcher.sh
-    makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit
 
     install -D linux-packaging/liberation-circuit.desktop $out/share/applications/liberation-circuit.desktop
     install -D linux-packaging/liberation-circuit.appdata.xml $out/share/metainfo/liberation-circuit.appdata.xml
@@ -29,6 +30,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postFixup = ''
+    makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit \
+      "''${gappsWrapperArgs[@]}"
+  '';
+
   meta = {
     description = "Real-time strategy game with programmable units";
     mainProgram = "liberation-circuit";