Merge branch 'channel-nixos' into python

This commit is contained in:
Florian Friesdorf 2013-01-11 07:35:30 +01:00
commit 4329ba3fb1
9 changed files with 91 additions and 43 deletions

View file

@ -1,25 +1,24 @@
args : with args;
rec {
args: with args; rec {
name = "linux-libertine-5.3.0";
src = fetchurl {
url = http://downloads.sourceforge.net/linuxlibertine/5.0.0/LinLibertineSRC_2011_05_22.tgz;
sha256 = "1cr0kvvlqrcmaxfl6szfp3m93mcnhmypx33dxmdm3xdxxkab74vg";
url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz;
sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
};
buildInputs = [fontforge];
configureFlags = [];
buildInputs = [ fontforge ];
/* doConfigure should be specified separately */
phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"];
extraFontForgeCommands = ''
ScaleToEm(1000);
'';
doUnpack = fullDepEntry ''
tar xf ${src}
'' ["minInit"];
doUnpack = lib.fullDepEntry ''
tar xf ${src}
'' ["minInit"];
name = "linux-libertine-5.0.0";
meta = {
description = "Linux Libertine Fonts";
homepage = http://linuxlibertine.sf.net;

View file

@ -0,0 +1,18 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, xfce }:
stdenv.mkDerivation rec {
name = "xfce4-notifyd-0.2.2";
src = fetchurl {
url = "http://archive.xfce.org/src/apps/xfce4-notifyd/0.2/${name}.tar.bz2";
sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn";
};
buildInputs = [ intltool pkgconfig gtk xfce.libxfce4util xfce.libxfce4ui xfce.xfconf ];
meta = {
homepage = http://goodies.xfce.org/projects/applications/xfce4-notifyd;
description = "The Xfce Notify Daemon";
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -73,6 +73,8 @@ rec {
ristretto = callPackage ./applications/ristretto.nix { };
xfce4_notifyd = callPackage ./applications/xfce4-notifyd.nix { };
xfce4_power_manager = callPackage ./applications/xfce4-power-manager.nix { };
xfce4mixer = callPackage ./applications/xfce4-mixer.nix { };

View file

@ -1,16 +1,16 @@
{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost}:
{stdenv, fetchurl, unzip, ogre, cmake, ois, freetype, libuuid, boost, pkgconfig}:
stdenv.mkDerivation rec {
name = "mygui-3.0.1";
name = "mygui-3.2.0";
src = fetchurl {
url = mirror://sourceforge/my-gui/MyGUI_3.0.1_source.zip;
sha256 = "1n56kl8ykzgv4k2nm9317jg9b9x2qa3l9hamz11hzn1qqjn2z4ig";
url = mirror://sourceforge/my-gui/MyGUI_3.2.0.zip;
sha256 = "16m1xrhx13qbwnp9gds2amlwycq8q5npr0665hnknwsb6rph010p";
};
enableParallelBuilding = true;
buildInputs = [ unzip ogre cmake ois freetype libuuid boost ];
buildInputs = [ unzip ogre cmake ois freetype libuuid boost pkgconfig ];
meta = {
homepage = http://mygui.info/;

View file

@ -8,11 +8,11 @@
, nvidia_cg_toolkit }:
stdenv.mkDerivation {
name = "ogre-1.7.2";
name = "ogre-1.8.1";
src = fetchurl {
url = "mirror://sourceforge/ogre/1.7/ogre_src_v1-7-2.tar.bz2";
sha256 = "10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5";
url = "mirror://sourceforge/ogre/1.8.1/ogre_src_v1-8-1.tar.bz2";
sha256 = "1avadx87sdfdk8165wlffnd5dzks694dcdnkg3ijap966k4qm46s";
};
cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ]

View file

@ -1,15 +1,33 @@
{ fetchurl, stdenv, cmake, boost, ogre, myguiSvn, ois, SDL, libvorbis, pkgconfig
, makeWrapper }:
{ fetchgit, stdenv, cmake, boost, ogre, mygui, ois, SDL, libvorbis, pkgconfig
, makeWrapper, enet, libXcursor }:
stdenv.mkDerivation rec {
name = "stunt-rally-1.4";
name = "stunt-rally-1.8";
src = fetchurl {
url = mirror://sourceforge/stuntrally/StuntRally-1.4-sources.tar.bz2;
sha256 = "1am5af4l1qliyrq1183sqvwzqwcjx0v6gkzsxhfmk6ygp7yhw7kq";
src = fetchgit {
url = git://github.com/stuntrally/stuntrally.git;
rev = "refs/tags/1.8";
sha256 = "0p8p83xx8q33kymsqnmxqca4jdfyg9rwrsac790z56gdbc7gnahm";
};
buildInputs = [ cmake boost ogre myguiSvn ois SDL libvorbis pkgconfig makeWrapper ];
tracks = fetchgit {
url = git://github.com/stuntrally/tracks.git;
rev = "refs/tags/1.8";
sha256 = "1gcrs21nn0v3hvhrw8dc0wh1knn5qh66cjx7a1igiciiadmi2s3l";
};
patchPhase = ''
sed -i 's/materials/materials material_templates/' data/CMakeLists.txt
'';
preConfigure = ''
mkdir data/tracks
cp -R $tracks/* data/tracks
'';
buildInputs = [ cmake boost ogre mygui ois SDL libvorbis pkgconfig makeWrapper enet
libXcursor
];
# I think they suppose cmake should give them OGRE_PLUGIN_DIR defined, but
# the cmake code I saw is not ready for that. Therefore, we use the env var.

View file

@ -1,24 +1,27 @@
{ fetchurl, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, irrlicht3843, libXxf86vm, curl, pkgconfig
, fribidi }:
{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
, fribidi, autoconf, automake, libtool }:
stdenv.mkDerivation rec {
name = "supertuxkart-0.7.3";
name = "supertuxkart-0.8";
src = fetchurl {
url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
sha256 = "0njrs2qyhbiqdbsqk9jx0sl8nhdwmipf1i91k23rv1biwrim9yq7";
sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr";
};
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext irrlicht3843
libXxf86vm curl pkgconfig fribidi
plib SDL openal freealut mesa libvorbis libogg gettext
libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake
];
configureFlags = [ "--with-irrlicht=${irrlicht3843}" ];
enableParallelBuilding = true;
postInstall = ''
mv $out/games $out/bin
preConfigure = ''
echo Building internal Irrlicht
cd lib/irrlicht/source/Irrlicht/
NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
cd -
'';
meta = {

View file

@ -6519,7 +6519,7 @@ let
liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
libertine = builderDefsPackage (import ../data/fonts/libertine) {
inherit fontforge;
inherit fetchurl fontforge lib;
};
lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
@ -8374,12 +8374,7 @@ let
superTux = callPackage ../games/super-tux { };
superTuxKart = callPackage ../games/super-tux-kart {
/* With GNU Make 3.82, the build process is stuck in the `data'
directory, after displaying "Making all in tracks", and `pstree'
indicates that `make' doesn't launch any new process. */
stdenv = overrideInStdenv stdenv [ gnumake381 ];
};
superTuxKart = callPackage ../games/super-tux-kart { };
tbe = callPackage ../games/the-butterfly-effect {};

View file

@ -742,6 +742,19 @@ let self = {
];
};
"optparse" = self."optparse-1.0.3";
"optparse-1.0.3" = self.buildNodePackage rec {
name = "optparse-1.0.3";
src = fetchurl {
url = "http://registry.npmjs.org/optparse/-/${name}.tgz";
sha256 = "1cg99i4rq8azxikzqz0ykw4q971azbj49d3m7slj041yscb6m883";
};
deps = [
];
};
"osenv" = self."osenv-0";
"osenv-0" = self.buildNodePackage rec {