diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-10-21 00:49:32 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:23:03 +0100 |
| commit | 58dfef27920780f83192987b46d8b47e2b045762 (patch) | |
| tree | c663d474a5616bbf7d243b11e8bc34395a34c8c2 /pkgs/desktops/gnome-3 | |
| parent | f302d78d6c8cbbcac418b8374445368931320c24 (diff) | |
| download | nixlib-58dfef27920780f83192987b46d8b47e2b045762.tar nixlib-58dfef27920780f83192987b46d8b47e2b045762.tar.gz nixlib-58dfef27920780f83192987b46d8b47e2b045762.tar.bz2 nixlib-58dfef27920780f83192987b46d8b47e2b045762.tar.lz nixlib-58dfef27920780f83192987b46d8b47e2b045762.tar.xz nixlib-58dfef27920780f83192987b46d8b47e2b045762.tar.zst nixlib-58dfef27920780f83192987b46d8b47e2b045762.zip | |
treewide: Fix references to apacheHttpd_2_*
Diffstat (limited to 'pkgs/desktops/gnome-3')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix index 381f7d7c4168..cd02dcb821f8 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix @@ -21,8 +21,8 @@ in stdenv.mkDerivation rec { sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" + configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2.out}/modules" "--disable-bluetooth" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix index 49ad40912c66..e8f649835062 100644 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf ''; - configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2}/modules" + configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" + "--with-modules-path=${apacheHttpd_2_2.out}/modules" "--disable-bluetooth" "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; |