diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-01-06 20:29:52 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2019-01-07 15:07:29 +0100 |
| commit | e1d98548167f52425c089b81f594dfa9c58a5e02 (patch) | |
| tree | c5ab49cc498605c4d478d1d44951b06c385971e3 /pkgs/games | |
| parent | bd7eec5d9cc61302c456cc51868fefb931e0793d (diff) | |
| download | nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.tar nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.tar.gz nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.tar.bz2 nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.tar.lz nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.tar.xz nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.tar.zst nixpkgs-e1d98548167f52425c089b81f594dfa9c58a5e02.zip | |
scons: 3.0.1 -> 3.0.2
A few packages broke due to the SCons upgrade (they depended on deprecated options that got removed), I've kept them on version 3.0.1 for now. The rest of the rebuilds seems fine (the failing ones where already in a broken state before this change).
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/btanks/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/globulation/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index b1c20d72520..9de90069a37 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, libGLU_combined, zlib, smpeg +{ stdenv, fetchurl, fetchpatch, sconsPackages, pkgconfig, SDL, libGLU_combined, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua5_1 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; }; - nativeBuildInputs = [ scons pkgconfig ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; buildInputs = [ SDL libGLU_combined zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index a539b79339f..edfb05d237c 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libGLU_combined, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net +{ stdenv, fetchurl, libGLU_combined, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net , speex, libvorbis, libogg, boost, fribidi, bsdiff , fetchpatch }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct ''; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; postConfigure = '' |