public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fsg build after updates in all-packages

Browse Source 
svn path=/nixpkgs/trunk/; revision=13913
This commit is contained in:
Michael Raskin 2009-01-30 06:26:40 +00:00
parent 7da93ed738
commit 0d577e421d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/fsg/alt-builder.nix
View File

@ -1,6 +1,6 @@
args: with args; args: with args;
let localDefs = builderDefs.passthru.function { let localDefs = builderDefs.passthru.function {
buildInputs =[(wxGTK null)]; buildInputs =[mesa (wxGTK null) libX11 xproto];
src = src =
fetchurl { fetchurl {
url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;

2
pkgs/games/fsg/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
}; };
buildInputs =[gtk glib pkgconfig (wxGTK null)]; buildInputs =[gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
/* /*
# One day Unicode will overcome? # One day Unicode will overcome?

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

@ -8410,14 +8410,16 @@ let
}); });
fsg = import ../games/fsg { fsg = import ../games/fsg {
inherit stdenv fetchurl pkgconfig; inherit stdenv fetchurl pkgconfig mesa;
inherit (gtkLibs) glib gtk; inherit (gtkLibs) glib gtk;
inherit (xlibs) libX11 xproto;
wxGTK = wxGTK28deps {unicode = false;}; wxGTK = wxGTK28deps {unicode = false;};
}; };
fsgAltBuild = import ../games/fsg/alt-builder.nix { fsgAltBuild = import ../games/fsg/alt-builder.nix {
inherit stdenv fetchurl; inherit stdenv fetchurl mesa;
wxGTK = wxGTK28deps {unicode = false;}; wxGTK = wxGTK28deps {unicode = false;};
inherit (xlibs) libX11 xproto;
stringsWithDeps = import ../lib/strings-with-deps.nix { stringsWithDeps = import ../lib/strings-with-deps.nix {
inherit stdenv lib; inherit stdenv lib;
}; };