diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-25 09:19:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-25 09:23:08 +0200 |
| commit | 69f8016de9e93d58850f0b3bee8597a30e76dc35 (patch) | |
| tree | f6456b3d6062fea1c6cc0dbc548e17f05e73e255 /pkgs/development/python-modules/dbus | |
| parent | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (diff) | |
| download | nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.tar nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.tar.gz nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.tar.bz2 nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.tar.lz nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.tar.xz nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.tar.zst nixpkgs-69f8016de9e93d58850f0b3bee8597a30e76dc35.zip | |
dbus-python: fix build with python-3
Also enable checks again.
Diffstat (limited to 'pkgs/development/python-modules/dbus')
| -rw-r--r-- | pkgs/development/python-modules/dbus/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 9152dffc9d2..af2e6af0c82 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 |