diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-06 16:16:18 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-01-06 16:16:18 +0100 |
| commit | cc671d5f329ea202a66a068d8e235588eb4e8868 (patch) | |
| tree | 1aa0b1a8be872630dfa5eedc1b9c7f92472c9d9c | |
| parent | 83481b87082efe630b6bcd3c5089f488d90be51f (diff) | |
| download | nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.tar nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.tar.gz nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.tar.bz2 nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.tar.lz nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.tar.xz nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.tar.zst nixpkgs-cc671d5f329ea202a66a068d8e235588eb4e8868.zip | |
vdrift: migrate to scons_latest
| -rw-r--r-- | pkgs/games/vdrift/default.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 19397794649..6fc4cc62b94 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , fetchsvn , pkg-config , sconsPackages @@ -33,10 +34,22 @@ let sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; }; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_latest ]; buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; - patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; + patches = [ + ./0001-Ignore-missing-data-for-installation.patch + (fetchpatch { + name = "scons-python-3-fixes.patch"; + url = "https://github.com/VDrift/vdrift/commit/2f1f72f2a7ce992b0aad30dc55509b966d1bb63d.patch"; + sha256 = "sha256-gpIB95b1s+wpThbNMFXyftBPXkZs9SIjuCcvt068uR8="; + }) + (fetchpatch { + name = "sconstruct-python-3-fix.patch"; + url = "https://github.com/VDrift/vdrift/commit/7d04c723a165109e015204642f4984a1a4452ccb.patch"; + sha256 = "sha256-ASEV46HnR90HXqI9SgHmkH2bPy5Y+vWN57vEN4hJMts="; + }) + ]; buildPhase = '' sed -i -e s,/usr/local,$out, SConstruct |