From e1d98548167f52425c089b81f594dfa9c58a5e02 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 6 Jan 2019 20:29:52 +0100 Subject: [PATCH] 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). --- pkgs/applications/audio/klick/default.nix | 6 +++--- pkgs/applications/audio/nova-filters/default.nix | 6 +++--- pkgs/development/tools/toluapp/default.nix | 4 ++-- pkgs/games/btanks/default.nix | 4 ++-- pkgs/games/globulation/default.nix | 4 ++-- pkgs/tools/graphics/lprof/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 4d1ae8ebd58..5e54609f8bf 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, pkgconfig +{ stdenv, fetchurl, sconsPackages, pkgconfig , libsamplerate, libsndfile, liblo, libjack2, boost }: stdenv.mkDerivation rec { @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkgconfig ]; + buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; prefixKey = "PREFIX="; NIX_CFLAGS_COMPILE = "-fpermissive"; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 1e52ff2d9e4..bb186687c66 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, scons, boost, ladspaH, pkgconfig }: +{stdenv, fetchurl, sconsPackages, boost, ladspaH, pkgconfig }: stdenv.mkDerivation rec { version = "0.2-2"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons boost ladspaH ]; + nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_0_1 ]; + buildInputs = [ boost ladspaH ]; patchPhase = '' # remove TERM: diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index 1214058698e..5ad9a7c58ef 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scons, lua }: +{ stdenv, fetchFromGitHub, sconsPackages, lua }: stdenv.mkDerivation rec { version = "1.0.93"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0zd55bc8smmgk9j4cf0jpibb03lgsvl0knpwhplxbv93mcdnw7s0"; }; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ lua ]; patches = [ ./environ-and-linux-is-kinda-posix.patch ]; 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 = '' diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index a4a2cfc1a7c..42ccc4d5022 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, scons, qt3, lcms1, libtiff, vigra }: +{ stdenv, fetchurl, sconsPackages, qt3, lcms1, libtiff, vigra }: /* how to calibrate your monitor: Eg see https://wiki.archlinux.org/index.php/ICC_Profiles#Loading_ICC_Profiles */ stdenv.mkDerivation { name = "lprof-1.11.4.1"; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ sconsPackages.scons_3_0_1 ]; buildInputs = [ qt3 lcms1 libtiff vigra ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf85fa0a6e..7559303bcba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9030,7 +9030,7 @@ in selendroid = callPackage ../development/tools/selenium/selendroid { }; 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; mill = callPackage ../development/tools/build-managers/mill { };