Merge pull request #209314 from wegank/glob2-scons
globulation2: migrate to scons_latest
This commit is contained in:
commit
15612c32bf
|
@ -24,6 +24,22 @@ stdenv.mkDerivation rec {
|
|||
url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
|
||||
sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/10_pthread_underlinkage.patch";
|
||||
sha256 = "sha256-L9POADlkgQbUQEUmx4s3dxXG9tS0w2IefpRGuQNRMI0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/link-boost-system.patch";
|
||||
sha256 = "sha256-ne6F2ZowB+TUmg3ePuUoPNxXI0ZJC6HEol3oQQHJTy4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/scons.patch";
|
||||
sha256 = "sha256-Gah7SoVcd/Aljs0Nqo3YF0lZImUWtrGM4HbbQ4yrhHU=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/boost-1.69.patch";
|
||||
sha256 = "sha256-D7agFR4uyIHxQz690Q8EHPF+rTEoiGUpgkm7r5cL5SI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
@ -32,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest ];
|
||||
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
|
||||
|
||||
postConfigure = ''
|
||||
|
|
|
@ -34578,9 +34578,7 @@ with pkgs;
|
|||
|
||||
gl117 = callPackage ../games/gl-117 { };
|
||||
|
||||
globulation2 = callPackage ../games/globulation {
|
||||
boost = boost168; # breaks with >= boost169
|
||||
};
|
||||
globulation2 = callPackage ../games/globulation { };
|
||||
|
||||
gltron = callPackage ../games/gltron { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue