Author: eelco
Date: Thu May 17 13:33:08 2012
New Revision: 34154
URL: https://nixos.org/websvn/nix/?rev=34154&sc=1
Log:
* pycurl: don't require a static curl, and don't put the generated
pycurl.so in a .egg file.
Modified:
nixpkgs/trunk/pkgs/top-level/python-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/python-packages.nix Thu May 17 10:17:32
2012 (r34153)
+++ nixpkgs/trunk/pkgs/top-level/python-packages.nix Thu May 17 13:33:08
2012 (r34154)
@@ -1475,36 +1475,27 @@
});
- pycurl =
- let libcurl = pkgs.stdenv.lib.overrideDerivation pkgs.curl
- (oldAttrs: {
- configureFlags =
- (if oldAttrs ? configureFlags then oldAttrs.configureFlags else "" )
- + " --enable-static";
- });
- in
- buildPythonPackage (rec {
+ pycurl = buildPythonPackage (rec {
name = "pycurl-7.19.0";
src = fetchurl {
- url =
"http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz";;
+ url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";;
sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b";
};
- buildInputs = [ libcurl ];
+ buildInputs = [ pkgs.curl ];
doCheck = false;
- postInstall = ''
- find $out -name easy-install.pth | xargs rm -v
- find $out -name 'site.py*' | xargs rm -v
+ preConfigure = ''
+ substituteInPlace setup.py --replace '--static-libs' '--libs'
'';
+ installCommand = "python setup.py install --prefix=$out";
+
meta = {
homepage = http://pycurl.sourceforge.net/;
-
description = "Python wrapper for libcurl";
-
platforms = stdenv.lib.platforms.linux;
};
});
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
