diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-27 17:06:57 +0000 |
| commit | 373507e28edeacd168b5c240840db2dac854882a (patch) | |
| tree | c73c8912afbd1a533dbc0d27da25dcd7f0d13d58 /nixpkgs/pkgs/games/torcs | |
| parent | b2ac96a35da6f6b95c7197811e421270319e8d50 (diff) | |
| parent | dfd8f84aef129f1978e446b5d45ef05cd4421821 (diff) | |
| download | nixlib-373507e28edeacd168b5c240840db2dac854882a.tar nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.gz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.bz2 nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.lz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.xz nixlib-373507e28edeacd168b5c240840db2dac854882a.tar.zst nixlib-373507e28edeacd168b5c240840db2dac854882a.zip | |
Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'
Diffstat (limited to 'nixpkgs/pkgs/games/torcs')
| -rw-r--r-- | nixpkgs/pkgs/games/torcs/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/games/torcs/default.nix b/nixpkgs/pkgs/games/torcs/default.nix index 7497084f8d02..67d7f82457f9 100644 --- a/nixpkgs/pkgs/games/torcs/default.nix +++ b/nixpkgs/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"; |