diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-08 20:13:23 +0200 |
| commit | 52d9c93abef582cfa32d94397aa86f0aa169917c (patch) | |
| tree | fd32d1eb551687c92a10487a0a877018791b73ff /pkgs/games/0ad | |
| parent | 629f7d055a8ec6815400affbfdd0a9f3384b0e2a (diff) | |
| parent | 777617f987c1e3e44f0f399582bc1b2e2f113c42 (diff) | |
Merge 'staging' into master
Diffstat (limited to 'pkgs/games/0ad')
| -rw-r--r-- | pkgs/games/0ad/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index c0dfe723c81e6..78b76f1ac3649 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenvType, callPackage, fetchurl, python27 +{ stdenv, callPackage, fetchurl, python27 , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL @@ -16,8 +16,8 @@ let zeroadData = callPackage ./data.nix { inherit version releaseType; }; archForPremake = - if stdenv.lib.hasPrefix "x86_64-" stdenvType then "x64" else - if stdenv.lib.hasPrefix "i686-" stdenvType then "x32" else "ERROR"; + if stdenv.lib.hasPrefix "x86_64-" stdenv.system then "x64" else + if stdenv.lib.hasPrefix "i686-" stdenv.system then "x32" else "ERROR"; in stdenv.mkDerivation rec { |