From f128c2a5a764b1cb0098efc9c3735c0dccb582ae Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 27 Oct 2023 19:27:00 +0200
Subject: [PATCH] disarchive: rename from guile-disarchive, fix program

---
 .../disarchive}/package.nix                    | 18 +++++++++++++++---
 pkgs/by-name/gu/guix/package.nix               |  6 +++---
 pkgs/top-level/aliases.nix                     |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)
 rename pkgs/by-name/{gu/guile-disarchive => di/disarchive}/package.nix (69%)

diff --git a/pkgs/by-name/gu/guile-disarchive/package.nix b/pkgs/by-name/di/disarchive/package.nix
similarity index 69%
rename from pkgs/by-name/gu/guile-disarchive/package.nix
rename to pkgs/by-name/di/disarchive/package.nix
index f01047db34c5..9bc24e531552 100644
--- a/pkgs/by-name/gu/guile-disarchive/package.nix
+++ b/pkgs/by-name/di/disarchive/package.nix
@@ -6,12 +6,13 @@
 , guile-gcrypt
 , guile-lzma
 , guile-quickcheck
+, makeWrapper
 , pkg-config
 , zlib
 }:
 
 stdenv.mkDerivation rec {
-  pname = "guile-disarchive";
+  pname = "disarchive";
   version = "0.5.0";
 
   src = fetchurl {
@@ -24,7 +25,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     guile
+    guile-gcrypt
     guile-lzma
+    makeWrapper
     pkg-config
   ];
 
@@ -38,14 +41,23 @@ stdenv.mkDerivation rec {
     guile-lzma
   ];
 
-  nativeCheckInputs = [ guile-quickcheck ];
-
   doCheck = !stdenv.isDarwin;
 
+  nativeCheckInputs = [
+    guile-quickcheck
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/disarchive \
+      --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \
+      --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"
+  '';
+
   meta = with lib; {
     description = "Disassemble software into data and metadata";
     homepage = "https://ngyro.com/software/disarchive.html";
     license = licenses.gpl3Plus;
+    mainProgram = "disarchive";
     maintainers = with maintainers; [ foo-dogsquared ];
     platforms = guile.meta.platforms;
   };
diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 5d45033b72fc..e20a969f8347 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -2,11 +2,11 @@
 , stdenv
 , fetchurl
 , autoreconfHook
+, disarchive
 , git
 , glibcLocales
 , guile
 , guile-avahi
-, guile-disarchive
 , guile-gcrypt
 , guile-git
 , guile-gnutls
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    disarchive
     git
     glibcLocales
     guile
     guile-avahi
-    guile-disarchive
     guile-gcrypt
     guile-git
     guile-gnutls
@@ -82,8 +82,8 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
+    disarchive
     guile-avahi
-    guile-disarchive
     guile-gcrypt
     guile-git
     guile-gnutls
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5dc11a345a6d..6674896d874e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -336,6 +336,7 @@ mapAliases ({
   gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10
   grub2_full = grub2; # Added 2022-11-18
   grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11
+  guile-disarchive = disarchive; # Added 2023-10-27
   guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16
 
   ### H ###