ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30696 from pbogdan/torcs-fix-build

Browse Source 
torcs: fix build & cleanups
This commit is contained in:
Joachim F 2017-10-23 16:40:11 +00:00 committed by GitHub
commit 32866a3b0b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/games/torcs/default.nix
View File

@ -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, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis,
libpng, zlib, bash, makeWrapper }: libpng, zlib, bash, makeWrapper }:
@ -10,7 +10,22 @@ stdenv.mkDerivation rec {
sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa"; 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 sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in
''; '';
@ -21,8 +36,6 @@ stdenv.mkDerivation rec {
installTargets = "install datainstall"; installTargets = "install datainstall";
hardeningDisable = [ "format" ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/torcs \ wrapProgram $out/bin/torcs \
--prefix LD_LIBRARY_PATH : ${mesa}/lib --prefix LD_LIBRARY_PATH : ${mesa}/lib