treewide: replace scons_latest with scons
This commit is contained in:
parent
9d7912fff3
commit
deb7dc3fdc
8 changed files with 16 additions and 16 deletions
|
@ -1,4 +1,4 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib
|
||||
{ mkDerivation, lib, fetchFromGitHub, pkg-config, scons, qtbase, lash, libjack2, jack ? libjack2, alsa-lib
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
|
@ -22,7 +22,7 @@ mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest pkg-config ];
|
||||
nativeBuildInputs = [ scons pkg-config ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
lash
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, sconsPackages
|
||||
, scons
|
||||
, rubberband
|
||||
, boost
|
||||
, libjack2
|
||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rubberband
|
||||
sconsPackages.scons_latest
|
||||
scons
|
||||
];
|
||||
buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
|
||||
prefixKey = "PREFIX=";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkg-config }:
|
||||
{lib, stdenv, fetchurl, scons, boost, ladspaH, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
version = "0.2-2";
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
|||
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ];
|
||||
nativeBuildInputs = [ pkg-config scons ];
|
||||
buildInputs = [ boost ladspaH ];
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
, openal
|
||||
, openssl
|
||||
, racket_7_9
|
||||
, sconsPackages
|
||||
, scons
|
||||
, zlib
|
||||
}:
|
||||
let
|
||||
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
openssl.dev
|
||||
racket_7_9
|
||||
];
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest ];
|
||||
nativeBuildInputs = [ scons ];
|
||||
|
||||
patches = [ ./fix-build.patch ];
|
||||
sconsFlags = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, fetchpatch
|
||||
, openssl
|
||||
, boost
|
||||
, sconsPackages
|
||||
, scons
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
sconsPackages.scons_latest
|
||||
scons
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, symlinkJoin
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, sconsPackages
|
||||
, scons
|
||||
, zlib
|
||||
, libiconv
|
||||
}:
|
||||
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
chmod -R u+w $out/share/nsis
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest ];
|
||||
nativeBuildInputs = [ scons ];
|
||||
buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
CPPPATH = symlinkJoin {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libGLU, libGL, SDL, sconsPackages, SDL_ttf, SDL_image, zlib, SDL_net
|
||||
{ lib, stdenv, fetchurl, libGLU, libGL, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net
|
||||
, speex, libvorbis, libogg, boost, fribidi, bsdiff
|
||||
, fetchpatch
|
||||
}:
|
||||
|
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest ];
|
||||
nativeBuildInputs = [ scons ];
|
||||
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
|
||||
|
||||
postConfigure = ''
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, fetchsvn
|
||||
, pkg-config
|
||||
, sconsPackages
|
||||
, scons
|
||||
, libGLU
|
||||
, libGL
|
||||
, SDL2
|
||||
|
@ -33,7 +33,7 @@ let
|
|||
sha256 = "sha256-DrzRF4WzwEXCNALq0jz8nHWZ1oYTEsdrvSYVYI1WkTI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ];
|
||||
nativeBuildInputs = [ pkg-config scons ];
|
||||
buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ];
|
||||
|
||||
patches = [
|
||||
|
|
Loading…
Reference in a new issue