ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Remove last reference to stdenvType

Browse Source
This commit is contained in:
Eelco Dolstra 2014-07-01 16:22:34 +02:00
parent 0d8014f6fc
commit f46108aaf0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/0ad/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, stdenvType, callPackage, fetchurl, python27 { stdenv, callPackage, fetchurl, python27
, pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng , pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL , openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL
@ -16,8 +16,8 @@ let
zeroadData = callPackage ./data.nix { inherit version releaseType; }; zeroadData = callPackage ./data.nix { inherit version releaseType; };
archForPremake = archForPremake =
if stdenv.lib.hasPrefix "x86_64-" stdenvType then "x64" else if stdenv.lib.hasPrefix "x86_64-" stdenv.system then "x64" else
if stdenv.lib.hasPrefix "i686-" stdenvType then "x32" else "ERROR"; if stdenv.lib.hasPrefix "i686-" stdenv.system then "x32" else "ERROR";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {