diff options
| author | Robert Helgesson <robert@rycee.net> | 2016-09-03 18:41:13 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2016-09-04 09:20:09 +0200 |
| commit | f144887ba027d74308374afb00e4476fee5aa6f6 (patch) | |
| tree | 7487ed1f7fa8da100811644288c852ccc5949e60 /pkgs/games | |
| parent | 8d977ead386cf29b8b395caca536bfaec9c36efe (diff) | |
| download | nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.tar nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.tar.gz nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.tar.bz2 nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.tar.lz nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.tar.xz nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.tar.zst nixpkgs-f144887ba027d74308374afb00e4476fee5aa6f6.zip | |
teeworlds: use wrapProgram
Replace custom wrapper by wrapProgram tool.
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/teeworlds/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 4485f7f2b9b..ea337c208df 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, python, alsaLib, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype }: +{ fetchurl, stdenv, makeWrapper, python, alsaLib +, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype +}: stdenv.mkDerivation rec { name = "teeworlds-0.6.3"; @@ -11,7 +13,9 @@ stdenv.mkDerivation rec { # we always want to use system libs instead of these postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; - buildInputs = [ python alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype ]; + buildInputs = [ + python makeWrapper alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype + ]; buildPhase = '' bam -a -v release @@ -38,12 +42,8 @@ stdenv.mkDerivation rec { # that they can access the graphics and sounds. for program in $executables do - mv -v "$out/bin/$program" "$out/bin/.wrapped-$program" - cat > "$out/bin/$program" <<EOF - #!/bin/sh - cd "$out/share/${name}" && exec "$out/bin/.wrapped-$program" "\$@" - EOF - chmod -v +x "$out/bin/$program" + wrapProgram $out/bin/$program \ + --run "cd $out/share/${name}" done # Copy the documentation. |