summary refs log tree commit diff
path: root/pkgs/servers/http/apache-modules
diff options
context:
space:
mode:
authorStig <stig@stig.io>2021-08-16 12:20:59 +0200
committerGitHub <noreply@github.com>2021-08-16 12:20:59 +0200
commit7d5b6f0fa20733262d821092fd00682c58607818 (patch)
tree47e74410ab91cc8e49672db03fdafb26bcc4ecb5 /pkgs/servers/http/apache-modules
parenta336bdd20987b683b8d4cbf90ea9adb6bced8caf (diff)
parent63ad6eb8a1603afd528b89cbd1519b353d42e537 (diff)
downloadnixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.tar
nixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.tar.gz
nixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.tar.bz2
nixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.tar.lz
nixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.tar.xz
nixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.tar.zst
nixpkgs-7d5b6f0fa20733262d821092fd00682c58607818.zip
Merge pull request #133768 from stigtsp/package/perl-mod_perl2-2.0.11-patch1
perlPackages.mod_perl2: fix build on perl-5.34.0, add nixos test
Diffstat (limited to 'pkgs/servers/http/apache-modules')
-rw-r--r--pkgs/servers/http/apache-modules/mod_perl/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix
index 2762f636f59..e511429bfc4 100644
--- a/pkgs/servers/http/apache-modules/mod_perl/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, apacheHttpd, perl }:
+{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "mod_perl";
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana";
   };
 
+  patches = [
+    # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617
+    ../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch
+  ];
+
   buildInputs = [ apacheHttpd perl ];
   buildPhase = ''
     perl Makefile.PL \
@@ -23,4 +28,6 @@ stdenv.mkDerivation rec {
     mv $out${perl}/* $out
     rm $out/nix -rf
   '';
+
+  passthru.tests = nixosTests.mod_perl;
 }