MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

treewide: Fix references to apacheHttpd_2_*

Browse source
This commit is contained in:
Tuomas Tynkkynen 2015-10-21 00:49:32 +03:00 committed by Vladimír Čunát
parent f302d78d6c
commit 58dfef2792
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/web-servers/apache-httpd/default.nix
View file

@ -6,7 +6,7 @@ let
mainCfg = config.services.httpd;
httpd = mainCfg.package;
httpd = mainCfg.package.out;
version24 = !versionOlder httpd.version "2.4";

4
pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
View file

@ -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" ];

4
pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix
View file

@ -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" ];

2
pkgs/top-level/perl-packages.nix
View file

@ -5956,7 +5956,7 @@ let self = _self // overrides; _self = with self; {
};
buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ];
propagatedBuildInputs = [ mod_perl2 ];
makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config";
makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config";
preConfigure = ''
# override broken prereq check
substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\""