about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-01-08 06:00:59 +0000
committerGitHub <noreply@github.com>2024-01-08 06:00:59 +0000
commita86f7216820f169d32169ada734e8a4a8f85d46f (patch)
treea599d8d5889afe31600029c8d3f48493cbf4ca86 /pkgs/desktops
parent2984c5a0a5daaf0410d9dda725214a3e8adb984e (diff)
parentd865557a4de48604318cce11d72f4336e7da3458 (diff)
downloadnixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.tar
nixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.tar.gz
nixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.tar.bz2
nixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.tar.lz
nixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.tar.xz
nixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.tar.zst
nixlib-a86f7216820f169d32169ada734e8a4a8f85d46f.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/mate/mate-user-share/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index 8dc35d704669..84204e3e34be 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -9,14 +9,16 @@
 , libnotify
 , libxml2
 , libcanberra-gtk3
-, mod_dnssd
-, apacheHttpd
+, apacheHttpdPackages
 , hicolor-icon-theme
 , mate
 , wrapGAppsHook
 , mateUpdateScript
 }:
 
+let
+  inherit (apacheHttpdPackages) apacheHttpd mod_dnssd;
+in
 stdenv.mkDerivation rec {
   pname = "mate-user-share";
   version = "1.26.0";