diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2024-01-04 21:42:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-04 21:42:22 +0100 |
| commit | fec6c9be5a81a85d3499259ca9d2e1e87e3bd697 (patch) | |
| tree | 7e84957841c010c247504e5a634a67dd64d5e41e /pkgs/desktops | |
| parent | ed63269b72cc21218824520baf8bd00d3be81586 (diff) | |
| parent | 26ea4a73ac811a3995668414811b9a0f5cd44699 (diff) | |
| download | nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.tar nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.tar.gz nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.tar.bz2 nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.tar.lz nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.tar.xz nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.tar.zst nixlib-fec6c9be5a81a85d3499259ca9d2e1e87e3bd697.zip | |
Merge pull request #278744 from jtojnar/gnome-user-share-fix
gnome.gnome-user-share: Fix eval with allowAliases = false
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-user-share/default.nix | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index 2a09ef1ae2b0..a9f14ba0437b 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -4,23 +4,26 @@ , meson , ninja , fetchurl -, apacheHttpd +, apacheHttpdPackages , pkg-config , glib , libxml2 , systemd -, wrapGAppsHook +, wrapGAppsNoGuiHook , itstool -, mod_dnssd , gnome }: -stdenv.mkDerivation rec { +let + inherit (apacheHttpdPackages) apacheHttpd mod_dnssd; +in + +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="; }; @@ -43,7 +46,7 @@ stdenv.mkDerivation rec { gettext itstool libxml2 - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -55,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; }; -} +}) |