b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

scons: 3.0.1 -> 3.0.2

Browse source 
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).
This commit is contained in:
Michael Weiss 2019-01-06 20:29:52 +01:00
parent bd7eec5d9c
commit e1d9854816
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/audio/klick/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, scons, pkgconfig { stdenv, fetchurl, sconsPackages, pkgconfig
, libsamplerate, libsndfile, liblo, libjack2, boost }: , libsamplerate, libsndfile, liblo, libjack2, boost }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ];
buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
prefixKey = "PREFIX="; prefixKey = "PREFIX=";
NIX_CFLAGS_COMPILE = "-fpermissive"; NIX_CFLAGS_COMPILE = "-fpermissive";

6
pkgs/applications/audio/nova-filters/default.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, scons, boost, ladspaH, pkgconfig }: {stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2-2"; version = "0.2-2";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_0_1 ];
buildInputs = [ scons boost ladspaH ]; buildInputs = [ boost ladspaH ];
patchPhase = '' patchPhase = ''
# remove TERM: # remove TERM:

4
pkgs/development/tools/toluapp/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, scons, lua }: { stdenv, fetchFromGitHub, sconsPackages, lua }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.93"; version = "1.0.93";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0"; sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0";
}; };
nativeBuildInputs = [ scons ]; nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
buildInputs = [ lua ]; buildInputs = [ lua ];
patches = [ ./environ-and-linux-is-kinda-posix.patch ]; patches = [ ./environ-and-linux-is-kinda-posix.patch ];

4
pkgs/games/btanks/default.nix
View file

@ -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 }: , SDL_image, libvorbis, expat, zip, lua5_1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; 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 ]; buildInputs = [ SDL libGLU_combined zlib smpeg SDL_image libvorbis expat zip lua5_1 ];
NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL";

4
pkgs/games/globulation/default.nix
View file

@ -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 , speex, libvorbis, libogg, boost, fribidi, bsdiff
, fetchpatch , fetchpatch
}: }:
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct 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 ]; buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
postConfigure = '' postConfigure = ''

4
pkgs/tools/graphics/lprof/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }: { stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }:
/* how to calibrate your monitor: /* how to calibrate your monitor:
Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles
*/ */
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lprof-1.11.4.1"; name = "lprof-1.11.4.1";
nativeBuildInputs = [ scons ]; nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
buildInputs = [ qt3 lcms1 libtiff vigra ]; buildInputs = [ qt3 lcms1 libtiff vigra ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

2
pkgs/top-level/all-packages.nix
View file

@ -9030,7 +9030,7 @@ in
selendroid = callPackage ../development/tools/selenium/selendroid { }; selendroid = callPackage ../development/tools/selenium/selendroid { };
sconsPackages = callPackage ../development/tools/build-managers/scons { }; sconsPackages = callPackage ../development/tools/build-managers/scons { };
scons = sconsPackages.scons_3_0_1; scons = sconsPackages.scons_3_0_2;
scons_2_5_1 = sconsPackages.scons_2_5_1; scons_2_5_1 = sconsPackages.scons_2_5_1;
mill = callPackage ../development/tools/build-managers/mill { }; mill = callPackage ../development/tools/build-managers/mill { };