summary refs log tree commit diff
path: root/pkgs/games/torcs
diff options
context:
space:
mode:
authoreri! <hans.orter@gmx.de>2019-04-24 21:26:14 +0200
committerRenaud <c0bw3b@users.noreply.github.com>2019-04-24 21:26:13 +0200
commit99b9166dd250b3c13978ee41b8e080083c1ec36f (patch)
treef8aea3faeab4b0776bf31bbcac742fbca482d0a7 /pkgs/games/torcs
parent857069293d4a5ac7babb5fa875879ca8a14b81ed (diff)
downloadnixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.tar
nixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.tar.gz
nixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.tar.bz2
nixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.tar.lz
nixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.tar.xz
nixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.tar.zst
nixpkgs-99b9166dd250b3c13978ee41b8e080083c1ec36f.zip
torcs: anonscm.debian.org has moved (#59316)
* torcs: anonscm.debian.org has moved

the patch links returned a HTTP error 401 as
anonscm.debian.org moved to a gitlab at salsa.debian.org
I used the non access required download link generated by the new instance
As @worldofpeace suggested in #58978 I used the last commit involving the files.

* torcs: add patch on OpenALMusicPlayer.cpp

Unbreak builds with GCC7
Diffstat (limited to 'pkgs/games/torcs')
-rw-r--r--pkgs/games/torcs/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix
index 7497084f8d0..67d7f82457f 100644
--- a/pkgs/games/torcs/default.nix
+++ b/pkgs/games/torcs/default.nix
@@ -12,25 +12,30 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/gcc6-isnan.patch";
+      url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/gcc6-isnan.patch";
       sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876";
     })
     (fetchpatch {
-      url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/format-argument.patch";
+      url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/format-argument.patch";
       sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja";
     })
     (fetchpatch {
-      url = "https://salsa.debian.org/games-team/torcs/raw/master/debian/patches/glibc-default-source.patch";
+      url = "https://salsa.debian.org/games-team/torcs/raw/fb0711c171b38c4648dc7c048249ec20f79eb8e2/debian/patches/glibc-default-source.patch";
       sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp";
     })
+    (fetchpatch {
+      url = "https://salsa.debian.org/games-team/torcs/raw/32bbe77c68b4de07b28c34497f3c0ad666ee618d/debian/patches/gcc7.patch";
+      sha256 = "09iilnvdv8h7b4nb1372arszkbz9hbzsck4rimzz1xjdh9ydniw9";
+    })
   ];
 
   postPatch = ''
     sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
   '';
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xorgproto
-    libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ];
+    libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ];
 
   installTargets = "install datainstall";