diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-31 11:46:46 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 11:46:46 +0000 |
| commit | ac5a927919638e6a9c69cd35084c7e7801472498 (patch) | |
| tree | 8df839983183262d486d639b0d6cae3ed042fcef /pkgs/servers/http | |
| parent | 3c526dbe2cf8ef9f7d700f689f01531df6898b99 (diff) | |
| parent | 72152ff5ad470ed1a5b97c0ba2737938c136c994 (diff) | |
| download | nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.gz nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.bz2 nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.lz nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.xz nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.tar.zst nixpkgs-ac5a927919638e6a9c69cd35084c7e7801472498.zip | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts: pkgs/development/python-modules/einops/default.nix pkgs/development/python-modules/elegy/default.nix
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/spawn-fcgi/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix index 8763591d05e..cc6e8c116ee 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0alfa8hz09jdg29bi1mvhwyr2nl0nvss2a2kybrcjvdw1fx6vijn"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; + nativeBuildInputs = [ autoreconfHook pkg-config autoconf automake ]; + buildInputs = [ apacheHttpd curl glib lasso libtool libxml2 libxslt openssl xmlsec ]; configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"]; diff --git a/pkgs/servers/http/spawn-fcgi/default.nix b/pkgs/servers/http/spawn-fcgi/default.nix index 090450ba968..77272694a89 100644 --- a/pkgs/servers/http/spawn-fcgi/default.nix +++ b/pkgs/servers/http/spawn-fcgi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "07r6nwbg4881mdgp0hqh80c4x9wb7jg6cgc84ghwhfbd2abc2iq5"; }; - buildInputs = [ automake autoconf ]; + nativeBuildInputs = [ automake autoconf ]; preConfigure = '' ./autogen.sh |