about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/fcgi
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-04-27 21:04:56 +0000
committerAlyssa Ross <hi@alyssa.is>2020-04-27 21:04:56 +0000
commita4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch)
tree47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/development/libraries/fcgi
parent5b00523fb58512232b819a301c4309f579c7f09c (diff)
parent22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff)
downloadnixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst
nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/fcgi')
-rw-r--r--nixpkgs/pkgs/development/libraries/fcgi/default.nix25
1 files changed, 9 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/fcgi/default.nix b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
index 5eb7e3866ce6..bde1682e3fc0 100644
--- a/nixpkgs/pkgs/development/libraries/fcgi/default.nix
+++ b/nixpkgs/pkgs/development/libraries/fcgi/default.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "fcgi";
-  version = "2.4.0";
+  version = "2.4.2";
 
-  src = fetchurl {
-    url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz";
-    #    url = "http://www.fastcgi.com/dist/${name}.tar.gz";
-    sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36";
+  src = fetchFromGitHub {
+    owner = "FastCGI-Archives";
+    repo = "fcgi2";
+    rev = version;
+    sha256 = "1jhz6jfwv5kawa8kajvg18nfwc1b30f38zc0lggszd1vcmrwqkz1";
   };
 
-  patches = [
-    ./gcc-4.4.diff
-    (fetchpatch {
-      # Fix a stack-smashing bug:
-      # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591
-      url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch";
-      sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m";
-    })
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   postInstall = "ln -s . $out/include/fastcgi";
 
   meta = with stdenv.lib; {
     description = "A language independent, scalable, open extension to CG";
-    homepage = http://www.fastcgi.com/;
+    homepage = "http://www.fastcgi.com/";
     license = "FastCGI see LICENSE.TERMS";
     platforms = platforms.all;
   };