From 1163928354502d923099efd6b4e982f779bd7fe9 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 11 Sep 2025 09:26:03 -0700
Subject: [PATCH] abduco: fix version, use hash and configureFlags

---
 pkgs/by-name/ab/abduco/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ab/abduco/package.nix b/pkgs/by-name/ab/abduco/package.nix
index 6526d8d6e806..6410c8d10919 100644
--- a/pkgs/by-name/ab/abduco/package.nix
+++ b/pkgs/by-name/ab/abduco/package.nix
@@ -9,10 +9,11 @@
 
 let
   rev = "8c32909a159aaa9484c82b71f05b7a73321eb491";
+  defaultUserConfig = writeText "config.def.h" conf;
 in
 stdenv.mkDerivation {
   pname = "abduco";
-  version = "unstable-2020-04-30";
+  version = "0.6.0-unstable-2020-04-30";
 
   src = fetchzip {
     urls = [
@@ -22,17 +23,18 @@ stdenv.mkDerivation {
     hash = "sha256-o7SPK/G31cW/rrLwV3UJOTq6EBHl6AEE/GdeKGlHdyg=";
   };
 
-  preBuild = lib.optionalString (conf != null) "cp ${writeText "config.def.h" conf} config.def.h";
+  configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-D_DARWIN_C_SOURCE" ];
+
+  preBuild = lib.optionalString (conf != null) "cp ${defaultUserConfig} config.def.h";
 
   installFlags = [ "install-completion" ];
-  CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
 
   patches = [
     # https://github.com/martanne/abduco/pull/22
     (fetchpatch {
       name = "use-XDG-directory-scheme-by-default";
       url = "https://github.com/martanne/abduco/commit/0e9a00312ac9777edcb169122144762e3611287b.patch";
-      sha256 = "sha256-4NkIflbRkUpS5XTM/fxBaELpvlZ4S5lecRa8jk0XC9g=";
+      hash = "sha256-4NkIflbRkUpS5XTM/fxBaELpvlZ4S5lecRa8jk0XC9g=";
     })
 
     # “fix bug where attaching to dead session won't give underlying exit code”
@@ -40,7 +42,7 @@ stdenv.mkDerivation {
     (fetchpatch {
       name = "exit-code-when-attaching-to-dead-session";
       url = "https://github.com/martanne/abduco/commit/972ca8ab949ee342569dbd66b47cc4a17b28247b.patch";
-      sha256 = "sha256-8hios0iKYDOmt6Bi5NNM9elTflGudnG2xgPF1pSkHI0=";
+      hash = "sha256-8hios0iKYDOmt6Bi5NNM9elTflGudnG2xgPF1pSkHI0=";
     })
 
     # “report pixel sizes to child processes that use ioctl(0, TIOCGWINSZ, ...)”
@@ -49,7 +51,7 @@ stdenv.mkDerivation {
     (fetchpatch {
       name = "report-pixel-sizes-to-child-processes";
       url = "https://github.com/martanne/abduco/commit/a1e222308119b3251f00b42e1ddff74a385d4249.patch";
-      sha256 = "sha256-eiF0A4IqJrrvXxjBYtltuVNpxQDv/iQPO+K7Y8hWBGg=";
+      hash = "sha256-eiF0A4IqJrrvXxjBYtltuVNpxQDv/iQPO+K7Y8hWBGg=";
     })
   ];