Taskwarrior is now nix, updated bluez

3 files changed, 18 insertions, 14 deletions

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index c837f9e..982ecc0 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -83,8 +83,8 @@
                                                     "font-cns11643"
                                                     "font-google-noto-emoji"
                                                     "syncthing"
-                                                    "taskwarrior"
-                                                    "tasksh"
+                                                    ;"taskwarrior"
+                                                    ;"tasksh"
                                                     ;"imv" ; Nix pkg now for MESA stuff
                                                     "perl"
                                                     "tor"
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index 70fb4b1..54b6060 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -397,6 +397,7 @@
     eza
     wl-mirror
     starship
+    taskwarrior3
 
     # Wrapped programs for some env variables
     (pkgs.writeScriptBin "hyprlock" ''
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
index 600117c..7ccfc2d 100644
--- a/modules/ryan-packages/linux.scm
+++ b/modules/ryan-packages/linux.scm
@@ -2,6 +2,7 @@
                #:use-module (guix download)
                #:use-module (guix packages)
                #:use-module (guix gexp)
+               #:use-module (guix build utils)
                #:use-module (gnu packages)
                #:use-module (gnu packages linux)
                #:use-module (gnu packages python-xyz)
@@ -11,7 +12,7 @@
 (define-public bluez-ryan
   (package
     (inherit bluez)
-    (version "5.72")
+    (version "5.79")
     (source
       (origin
         (method url-fetch)
@@ -20,16 +21,18 @@
                version ".tar.xz"))
         (sha256
           (base32
-            "0vjk4ihywzv8k07bxq7clqgi2afrw54nfp0gcnxw35m98nipz7a9"))))
-    (arguments (list
-                 #:configure-flags
-                 #~(list "--sysconfdir=/etc"
-                         "--localstatedir=/var"
-                         "--enable-library"
-                         "--disable-manpages"
-                         "--disable-systemd"
-                         "--enable-hid2hci"
-                         (string-append "--with-dbusconfdir=" #$output "/etc")
-                         (string-append "--with-udevdir=" #$output "/lib/udev"))))))
+            "12pal1m4xlr8k7kxb6isv5lbaca2wc5zcgy0907wfwcz78qaar21"))))
+    (arguments (substitute-keyword-arguments (package-arguments bluez)
+      ((#:configure-flags ''())
+       #~(append (list "--disable-manpages") #$flags))
+      ((#:phases phases)
+       #~(modify-phases #$phases
+            (add-after 'configure 'fix-make
+              (lambda _
+                (substitute* "Makefile"
+                  (("install-confDATA:") "install-IGNORED:")
+                  (("install-confDATA") "")
+                  (("bluetoothd-fix-permissions:") "install-IGNORED2:")
+                  (("bluetoothd-fix-permissions") ""))))))))))
 
 bluez-ryan