diff options
| -rw-r--r-- | pkgs/development/python-modules/pycairo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/diod/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 3dc64f68129..0589bec36b9 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11 }: +{ stdenv, fetchurl, fetchpatch, python, pkgconfig, cairo, x11, isPyPy }: -stdenv.mkDerivation rec { +if isPyPy then throw "pycairo not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { version = "1.10.0"; name = "pycairo-${version}"; src = if python.is_py3k or false diff --git a/pkgs/servers/diod/default.nix b/pkgs/servers/diod/default.nix index 0753df43be5..4f0597ab3c3 100644 --- a/pkgs/servers/diod/default.nix +++ b/pkgs/servers/diod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, munge, lua5, libcap, perl, ncurses }: +{ stdenv, fetchurl, munge, lua, libcap, perl, ncurses }: stdenv.mkDerivation rec { name = "diod-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0h92zadbkq4fjhqjzq17cl3x7bdkz2yakpcl0nccv4ml0gwfbx27"; }; - buildInputs = [ munge lua5 libcap perl ncurses ]; + buildInputs = [ munge lua libcap perl ncurses ]; meta = { description = "An I/O forwarding server that implements a variant of the 9P protocol"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edea89c4ce0..d5659e654dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6080,7 +6080,7 @@ let pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; - podofo = callPackage ../development/libraries/podofo { }; + podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; polkit = callPackage ../development/libraries/polkit { spidermonkey = spidermonkey_185; @@ -6935,7 +6935,7 @@ let dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; - diod = callPackage ../servers/diod { }; + diod = callPackage ../servers/diod { lua = lua5_1; }; dovecot = dovecot21; @@ -10610,7 +10610,7 @@ let oilrush = callPackage ../games/oilrush { }; - openra = callPackage ../games/openra { }; + openra = callPackage ../games/openra { lua = lua5_1; }; openttd = callPackage ../games/openttd { zlib = zlibStatic; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b89bd1908bf..e9bf49668b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -138,7 +138,7 @@ rec { pycairo = import ../development/python-modules/pycairo { inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11; - inherit python; + inherit python isPyPy; }; pycrypto = import ../development/python-modules/pycrypto { |