diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-03-27 14:47:48 +0100 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-03-27 10:49:52 -0700 |
commit | 0950324466d7d978dadccf8dee58c89344d8326b (patch) | |
tree | b631f3381f45c3af48c8344cae1a8a6e995323a4 /pkgs/applications/audio | |
parent | e9aa2ef64ac52d3dca00422a3dfb54dcc7e3cc93 (diff) | |
download | nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.tar nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.tar.gz nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.tar.bz2 nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.tar.lz nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.tar.xz nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.tar.zst nixpkgs-0950324466d7d978dadccf8dee58c89344d8326b.zip |
scons: Add passthru.py2 for backward compatibility
Not all packages build with Python 3, see #75877. The goal is to get rid of Python 2 but this approach ensures a smoother transition.
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/jackmix/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/mixxx/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/rhvoice/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index fe7c83dd56f..5df6e1e2dae 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -9,9 +9,8 @@ stdenv.mkDerivation { patches = [ ./no_error.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ scons.py2 pkgconfig ]; buildInputs = [ - scons qt4 lash jack diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 82db91dcb07..950469e9a33 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -17,10 +17,11 @@ mkDerivation rec { sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; }; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg - qtx11extras rubberband scons sqlite taglib upower vampSDK + qtx11extras rubberband sqlite taglib upower vampSDK ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index e3eb750496b..59a8b6ec8c4 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - scons pkgconfig + scons.py2 pkgconfig ]; buildInputs = [ |