From 69f8016de9e93d58850f0b3bee8597a30e76dc35 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Wed, 25 May 2016 09:19:09 +0200 Subject: dbus-python: fix build with python-3 Also enable checks again. --- pkgs/development/python-modules/dbus/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/development/python-modules/dbus') diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 9152dffc9d28..af2e6af0c826 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy }: +{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +, ncurses }: if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { name = "dbus-python-1.2.4"; @@ -11,9 +12,12 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa postPatch = "patchShebangs ."; buildInputs = [ python pkgconfig dbus dbus_glib ] - ++ stdenv.lib.optional doCheck dbus_tools; + ++ stdenv.lib.optional doCheck dbus_tools + # My guess why it's sometimes trying to -lncurses. + # It seems not to retain the dependency anyway. + ++ stdenv.lib.optional (! python ? modules) ncurses; - doCheck = false; # https://bugs.freedesktop.org/show_bug.cgi?id=57140 + doCheck = true; # Set empty pythonPath, so that the package is recognized as a python package # for python.buildEnv -- cgit 1.4.1