From 0b8417823db108a7e5186a595da667b9ce271511 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 5 Dec 2017 16:04:03 +0100 Subject: [PATCH] librepo: add bindings to python-packages.nix --- pkgs/tools/package-management/librepo/default.nix | 6 ++++-- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 622d095d461..b08d65e123d 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: +{ stdenv, fetchFromGitHub, cmake, python, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }: stdenv.mkDerivation rec { version = "1.8.1"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ]; + cmakeFlags="-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"; + + buildInputs = [ python expat glib pcre openssl curl check attr gpgme ]; # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here propagatedBuildInputs = [ curl gpgme expat ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d857ac6512..7059f1749c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10404,6 +10404,10 @@ in { cudaSupport = pkgs.config.cudaSupport or false; }; + librepo = toPythonModule (pkgs.librepo.override { + inherit python; + }); + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; };