diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-10-24 14:47:43 +0200 |
commit | 5621b77a33b311e82c8870f6872a2beffef9dbd0 (patch) | |
tree | 1d561826278871fa8c065ff84cdadc0922cb758b /pkgs/games/torcs/default.nix | |
parent | 658335d6a88b623ab926dea99425e2716afa7f4e (diff) | |
parent | 322fa6b06cfbe66ef1bc12b1bfd5fd37d63cbf87 (diff) | |
download | nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.gz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.bz2 nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.lz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.xz nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.tar.zst nixpkgs-5621b77a33b311e82c8870f6872a2beffef9dbd0.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/games/torcs/default.nix')
-rw-r--r-- | pkgs/games/torcs/default.nix | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1ea94a5d2ce..1b6ad5b34c3 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -10,7 +10,22 @@ stdenv.mkDerivation rec { sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa"; }; - patchPhase = '' + patches = [ + (fetchpatch { + url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/gcc6-isnan.patch"; + sha256 = "16scmq30vwb8429ah9d4ws0v1w6ai59lvn7hcgnvfzyap42ry876"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/format-argument.patch"; + sha256 = "04advcx88yh23ww767iysydzhp370x7cqp2wf9hk2y1qvw7mxsja"; + }) + (fetchpatch { + url = "https://anonscm.debian.org/git/pkg-games/torcs.git/plain/debian/patches/glibc-default-source.patch"; + sha256 = "0k4hgpddnhv68mdc9ics7ah8q54j60g394d7zmcmzg6l3bjd9pyp"; + }) + ]; + + postPatch = '' sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; @@ -21,8 +36,6 @@ stdenv.mkDerivation rec { installTargets = "install datainstall"; - hardeningDisable = [ "format" ]; - postInstall = '' wrapProgram $out/bin/torcs \ --prefix LD_LIBRARY_PATH : ${mesa}/lib |