diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
| commit | 96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch) | |
| tree | ea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/games/torcs/default.nix | |
| parent | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff) | |
| parent | 084626deecaffcaa017af07eaab00682eff5d6f3 (diff) | |
| download | nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.gz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.bz2 nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.lz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.xz nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.tar.zst nixlib-96cec2a7bdf2482ae58fe04cce5e87a1eec644f9.zip | |
Merge 'staging' into multiple-outputs
Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/games/torcs/default.nix')
| -rw-r--r-- | pkgs/games/torcs/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index f5b713ae3373..e6370d6e7c61 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -3,11 +3,11 @@ libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash }: stdenv.mkDerivation rec { - name = "torcs-1.3.2"; + name = "torcs-1.3.5"; src = fetchurl { url = "mirror://sourceforge/torcs/${name}.tar.bz2"; - sha256 = "0171ixhnd9cs8jkwa5awrxklfgyykcbc9m8270b8cw30lsx7qhp1"; + sha256 = "170ff98smkkv1sk4nbz9w0alhmmbr32djmgbc08lcfhf0lj2ni38"; }; patchPhase = '' @@ -24,8 +24,9 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; - license = "GPLv2+"; + license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } |