alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fix a bunch of packages with lua5_1

Browse source
This commit is contained in:
Domen Kožar 2014-09-10 17:21:45 +02:00
parent 427363c45a
commit 33ce850b82
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/python-modules/pycairo/default.nix
View file

@ -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"; version = "1.10.0";
name = "pycairo-${version}"; name = "pycairo-${version}";
src = if python.is_py3k or false src = if python.is_py3k or false

4
pkgs/servers/diod/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, munge, lua5, libcap, perl, ncurses }: { stdenv, fetchurl, munge, lua, libcap, perl, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "diod-${version}"; name = "diod-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0h92zadbkq4fjhqjzq17cl3x7bdkz2yakpcl0nccv4ml0gwfbx27"; sha256 = "0h92zadbkq4fjhqjzq17cl3x7bdkz2yakpcl0nccv4ml0gwfbx27";
}; };
buildInputs = [ munge lua5 libcap perl ncurses ]; buildInputs = [ munge lua libcap perl ncurses ];
meta = { meta = {
description = "An I/O forwarding server that implements a variant of the 9P protocol"; description = "An I/O forwarding server that implements a variant of the 9P protocol";

6
pkgs/top-level/all-packages.nix
View file

@ -6080,7 +6080,7 @@ let
pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; pocketsphinx = callPackage ../development/libraries/pocketsphinx { };
podofo = callPackage ../development/libraries/podofo { }; podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
polkit = callPackage ../development/libraries/polkit { polkit = callPackage ../development/libraries/polkit {
spidermonkey = spidermonkey_185; spidermonkey = spidermonkey_185;
@ -6935,7 +6935,7 @@ let
dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {}; dictdWordnet = callPackage ../servers/dict/dictd-wordnet.nix {};
diod = callPackage ../servers/diod { }; diod = callPackage ../servers/diod { lua = lua5_1; };
dovecot = dovecot21; dovecot = dovecot21;
@ -10610,7 +10610,7 @@ let
oilrush = callPackage ../games/oilrush { }; oilrush = callPackage ../games/oilrush { };
openra = callPackage ../games/openra { }; openra = callPackage ../games/openra { lua = lua5_1; };
openttd = callPackage ../games/openttd { openttd = callPackage ../games/openttd {
zlib = zlibStatic; zlib = zlibStatic;

2
pkgs/top-level/python-packages.nix
View file

@ -138,7 +138,7 @@ rec {
pycairo = import ../development/python-modules/pycairo { pycairo = import ../development/python-modules/pycairo {
inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11; inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11;
inherit python; inherit python isPyPy;
}; };
pycrypto = import ../development/python-modules/pycrypto { pycrypto = import ../development/python-modules/pycrypto {