nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #223078 from wegank/scons-latest

Browse Source 
treewide: replace scons_latest with scons
This commit is contained in:
Weijia Wang 2023-03-25 18:22:16 +02:00 committed by GitHub
commit 89e0570cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/jackmix/default.nix
View File

@ -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 , fetchpatch
}: }:
@ -22,7 +22,7 @@ mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ sconsPackages.scons_latest pkg-config ]; nativeBuildInputs = [ scons pkg-config ];
buildInputs = [ buildInputs = [
qtbase qtbase
lash lash

4
pkgs/applications/audio/klick/default.nix
View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, sconsPackages , scons
, rubberband , rubberband
, boost , boost
, libjack2 , libjack2
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
rubberband rubberband
sconsPackages.scons_latest scons
]; ];
buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ]; buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
prefixKey = "PREFIX="; prefixKey = "PREFIX=";

4
pkgs/applications/audio/nova-filters/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, sconsPackages, boost, ladspaH, pkg-config }: {lib, stdenv, fetchurl, scons, boost, ladspaH, pkg-config }:
stdenv.mkDerivation { stdenv.mkDerivation {
version = "0.2-2"; version = "0.2-2";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
}; };
nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; nativeBuildInputs = [ pkg-config scons ];
buildInputs = [ boost ladspaH ]; buildInputs = [ boost ladspaH ];
patchPhase = '' patchPhase = ''

4
pkgs/applications/graphics/fluxus/default.nix
View File

@ -18,7 +18,7 @@
, openal , openal
, openssl , openssl
, racket_7_9 , racket_7_9
, sconsPackages , scons
, zlib , zlib
}: }:
let let
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
openssl.dev openssl.dev
racket_7_9 racket_7_9
]; ];
nativeBuildInputs = [ sconsPackages.scons_latest ]; nativeBuildInputs = [ scons ];
patches = [ ./fix-build.patch ]; patches = [ ./fix-build.patch ];
sconsFlags = [ sconsFlags = [

4
pkgs/development/libraries/swiften/default.nix
View File

@ -9,7 +9,7 @@
, fetchpatch , fetchpatch
, openssl , openssl
, boost , boost
, sconsPackages , scons
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
sconsPackages.scons_latest scons
]; ];
buildInputs = [ buildInputs = [

4
pkgs/development/tools/nsis/default.nix
View File

@ -3,7 +3,7 @@
, symlinkJoin , symlinkJoin
, fetchurl , fetchurl
, fetchzip , fetchzip
, sconsPackages , scons
, zlib , zlib
, libiconv , libiconv
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
chmod -R u+w $out/share/nsis chmod -R u+w $out/share/nsis
''; '';
nativeBuildInputs = [ sconsPackages.scons_latest ]; nativeBuildInputs = [ scons ];
buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
CPPPATH = symlinkJoin { CPPPATH = symlinkJoin {

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

@ -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 , speex, libvorbis, libogg, boost, fribidi, bsdiff
, fetchpatch , fetchpatch
}: }:
@ -48,7 +48,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 = [ sconsPackages.scons_latest ]; nativeBuildInputs = [ scons ];
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
postConfigure = '' postConfigure = ''

4
pkgs/games/vdrift/default.nix
View File

@ -3,7 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, fetchsvn , fetchsvn
, pkg-config , pkg-config
, sconsPackages , scons
, libGLU , libGLU
, libGL , libGL
, SDL2 , SDL2
@ -33,7 +33,7 @@ let
sha256 = "sha256-DrzRF4WzwEXCNALq0jz8nHWZ1oYTEsdrvSYVYI1WkTI="; sha256 = "sha256-DrzRF4WzwEXCNALq0jz8nHWZ1oYTEsdrvSYVYI1WkTI=";
}; };
nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; nativeBuildInputs = [ pkg-config scons ];
buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ];
patches = [ patches = [