From e2caaf1f8c4dc5f10582035501892ba6050dbaf1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 4 Jan 2024 19:25:00 +0100
Subject: [PATCH 1/2] gnome.gnome-user-share: Fix eval with allowAliases =
 false

---
 pkgs/desktops/gnome/core/gnome-user-share/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix
index 2a09ef1ae2b01..ece93553ac0cd 100644
--- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix
@@ -4,17 +4,20 @@
 , meson
 , ninja
 , fetchurl
-, apacheHttpd
+, apacheHttpdPackages
 , pkg-config
 , glib
 , libxml2
 , systemd
 , wrapGAppsHook
 , itstool
-, mod_dnssd
 , gnome
 }:
 
+let
+  inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
+in
+
 stdenv.mkDerivation rec {
   pname = "gnome-user-share";
   version = "43.0";

From 26ea4a73ac811a3995668414811b9a0f5cd44699 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 4 Jan 2024 19:29:59 +0100
Subject: [PATCH 2/2] gnome.gnome-user-share: clean up

Wrapper only needed for settings schema.
---
 .../gnome/core/gnome-user-share/default.nix    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix
index ece93553ac0cd..a9f14ba0437b3 100644
--- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix
@@ -9,7 +9,7 @@
 , glib
 , libxml2
 , systemd
-, wrapGAppsHook
+, wrapGAppsNoGuiHook
 , itstool
 , gnome
 }:
@@ -18,12 +18,12 @@ let
   inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-user-share";
   version = "43.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major version}/gnome-user-share-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz";
     sha256 = "DfMGqgVYMT81Pvf1G/onwDYoGtxFZ34c+/p8n4YVOM4=";
   };
 
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     gettext
     itstool
     libxml2
-    wrapGAppsHook
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [
@@ -58,16 +58,16 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "gnome.${pname}";
+      packageName = "gnome-user-share";
+      attrPath = "gnome.gnome-user-share";
     };
   };
 
   meta = with lib; {
-    homepage = "https://help.gnome.org/users/gnome-user-share/3.8";
+    homepage = "https://gitlab.gnome.org/GNOME/gnome-user-share";
     description = "Service that exports the contents of the Public folder in your home directory on the local network";
     maintainers = teams.gnome.members;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
-}
+})