Author: eelco
Date: Thu Aug 26 13:09:52 2010
New Revision: 23461
URL: https://svn.nixos.org/websvn/nix/?rev=23461&sc=1
Log:
* Make sitecopy build against Neon 0.29.
Modified:
nixpkgs/trunk/pkgs/tools/networking/sitecopy/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/sitecopy/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/sitecopy/default.nix Thu Aug 26
12:56:12 2010 (r23460)
+++ nixpkgs/trunk/pkgs/tools/networking/sitecopy/default.nix Thu Aug 26
13:09:52 2010 (r23461)
@@ -1,14 +1,18 @@
-{stdenv, fetchurl, neon, openssl}:
+{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "sitecopy-0.16.6";
src = fetchurl {
- url = http://www.manyfish.co.uk/sitecopy/sitecopy-0.16.6.tar.gz;
+ url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz";;
sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0";
};
- buildInputs = [openssl];
+ patches = [ ./neon-29.patch ];
+
+ preConfigure = "autoreconf";
+
+ buildInputs = [ openssl neon zlib autoconf automake libtool ];
configureFlags= "--with-ssl=openssl";
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 26 12:56:12
2010 (r23460)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Aug 26 13:09:52
2010 (r23461)
@@ -1161,9 +1161,7 @@
system_config_printer = callPackage ../tools/misc/system-config-printer { };
- sitecopy = callPackage ../tools/networking/sitecopy {
- neon = neon026;
- };
+ sitecopy = callPackage ../tools/networking/sitecopy { };
privoxy = callPackage ../tools/networking/privoxy {
autoconf = autoconf213;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
