about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-09-24 16:49:27 +0200
committerGitHub <noreply@github.com>2019-09-24 16:49:27 +0200
commitc04cece6026eb73cb7654ea6c2f1cf7b0a33eb30 (patch)
tree39bce95d089dea87e30fa43f6e7ba983860225c8 /pkgs
parent291fd197d0b2c4e3583f7825eba4248089dc42f3 (diff)
parentcc7c778bf143fd5651034d88bc5b9db7bba1e91b (diff)
downloadnixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.tar
nixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.tar.gz
nixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.tar.bz2
nixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.tar.lz
nixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.tar.xz
nixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.tar.zst
nixlib-c04cece6026eb73cb7654ea6c2f1cf7b0a33eb30.zip
Merge pull request #68700 from jonringer/fix-pycurl2
pythonPackage.pycurl2: fix build
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/pycurl2/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix
index 01428d41b7d2..478f4451cf7a 100644
--- a/pkgs/development/python-modules/pycurl2/default.nix
+++ b/pkgs/development/python-modules/pycurl2/default.nix
@@ -1,6 +1,4 @@
-{ stdenv
-, buildPythonPackage
-, fetchgit
+{ lib, buildPythonPackage, fetchFromGitHub
 , isPy3k
 , simplejson
 , unittest2
@@ -13,8 +11,9 @@ buildPythonPackage {
   version = "7.20.0";
   disabled = isPy3k;
 
-  src = fetchgit {
-    url = "https://github.com/Lispython/pycurl.git";
+  src = fetchFromGitHub {
+    owner = "Lispython";
+    repo = "pycurl";
     rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
     sha256 = "1qmw3cm93kxj94s71a8db9lwv2cxmr2wjv7kp1r8zildwdzhaw7j";
   };
@@ -22,9 +21,10 @@ buildPythonPackage {
   # error: (6, "Couldn't resolve host 'h.wrttn.me'")
   doCheck = false;
 
-  buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+  nativeBuildInputs = [ pkgs.curl.dev ];
+  buildInputs = [ simplejson unittest2 nose ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://pypi.python.org/pypi/pycurl2;
     description = "A fork from original PycURL library that no maintained from 7.19.0";
     license = licenses.mit;