From 49b040c2df7bdb24e37cb6a8e7be32914aff536c Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Mon, 24 Feb 2025 23:18:22 +0700
Subject: [PATCH 1/2] cosmic-settings-daemon: 1.0.0-alpha.5.1 -> 1.0.0-alpha.6

---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 992dc9df980f..36a9c77de543 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-alpha.5.1";
+  version = "1.0.0-alpha.6";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     rev = "epoch-${version}";
-    hash = "sha256-MlBnwbszwJCa/FQNihSKsy7Bllw807C8qQL9ziYS3fE=";
+    hash = "sha256-DtwW6RxHnNh87Xu0NCULfUsHNzYU9tHtFKE9HO3rvME=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ianyD+ws/t2Qg+UG3eGE1WP2dHS2iWdCTolk/ZH/Ddg=";
+  cargoHash = "sha256-lGzQBL9IXbPsaKeVHp34xkm5FnTxWvfw4wg3El4LZdA=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 3604f213fbd61f1c6285b3a22d5e28709e6acf1e Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Tue, 25 Feb 2025 13:07:54 +0700
Subject: [PATCH 2/2] cosmic-settings-daemon: Add GEOCLUE_AGENT to build
 environment

Add GEOCLUE_AGENT to the build environment, since it has a recommended
dependency on GEOCLUE_AGENT in the control file.

I originally tried setting the `geoclue_agent` through the makefile
options, since that seemed more correct. I am not quite sure why that
didn't work - even with a patched upstream makefile?

Eg.

```
makeFlags = [
    "prefix=$(out)"
    "geoclue_agent=${lib.getLib geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"
    "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"
    ];
```

I expected this to work.
---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 36a9c77de543..19a65681bf07 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -4,6 +4,7 @@
   stdenv,
   rustPlatform,
   pkg-config,
+  geoclue2-with-demo-agent,
   libinput,
   udev,
 }:
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
+  env.GEOCLUE_AGENT = "${lib.getLib geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent";
+
   makeFlags = [
     "prefix=$(out)"
     "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"