diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
| commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
| tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/games | |
| parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
| parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
| download | nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixlib-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip | |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/orbit/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index f2e12f22912b..65e394f60bb2 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, builderDefs, mesa, libXi, libXt, libXext, libX11 -, libXmu, freeglut, esound }: +, libXmu, freeglut }: with builderDefs; let localDefs = builderDefs.passthru.function (rec { @@ -9,7 +9,7 @@ with builderDefs; url = http://ftp.de.debian.org/debian/pool/main/s/space-orbit/space-orbit_1.01.orig.tar.gz; }; - buildInputs = [mesa libXi libXt libXext libX11 libXmu freeglut esound]; + buildInputs = [mesa libXi libXt libXext libX11 libXmu freeglut]; configureFlags = []; debianPatch = fetchurl { @@ -20,7 +20,7 @@ with builderDefs; gunzip < ${debianPatch} | patch -Np1 cd src sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c - sed -e '/DIR=/d' -i Makefile + sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile make ensureDir $out/bin cp -r .. $out/dump |