mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
pygame: Fix build with multiple outputs
The config.py script doesn't seem to cope very well with symlinks, so let's pass it the right derivation outputs wherever possible and fall back to drv.out. I've disabled the tests because they somehow now seem to cause the build to fail even though the tests failed *before* the merge of the closure-size branch, but the whole build didn't fail regardless. Here is a build from before the closure-size branch merge: http://hydra.nixos.org/build/34367296 If you have a look at the build log, you already see a bunch of failing tests (to be exact: the same set of tests that are failing now with the fix of the preConfigure phase). Other than that, the build now succeeds on my machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
2c024d28a2
commit
f5ec09842d
@ -18,14 +18,17 @@ buildPythonPackage {
|
||||
# /nix/store/94kswjlwqnc0k2bnwgx7ckx0w2kqzaxj-stdenv/setup: line 73: python: command not found
|
||||
disabled = isPy3k;
|
||||
|
||||
# Tests fail because of no audio device and display.
|
||||
doCheck = false;
|
||||
|
||||
patches = [ ./pygame-v4l.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
for i in ${SDL_image} ${SDL_mixer} ${SDL_ttf} ${libpng} ${libjpeg} ${portmidi} ${libX11}; do
|
||||
sed -e "/origincdirs =/a'$i/include'," -i config_unix.py
|
||||
sed -e "/origlibdirs =/aoriglibdirs += '$i/lib'," -i config_unix.py
|
||||
done
|
||||
|
||||
preConfigure = stdenv.lib.concatMapStrings (dep: ''
|
||||
sed \
|
||||
-e "/origincdirs =/a'${dep.dev or dep.out}/include'," \
|
||||
-e "/origlibdirs =/aoriglibdirs += '${dep.lib or dep.out}/lib'," \
|
||||
-i config_unix.py
|
||||
'') [ SDL_image SDL_mixer SDL_ttf libpng libjpeg portmidi libX11 ] + ''
|
||||
LOCALBASE=/ python config.py
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user