3
0
Fork 0
forked from mirrors/nixpkgs

Remove last reference to stdenvType

This commit is contained in:
Eelco Dolstra 2014-07-01 16:22:34 +02:00
parent 0d8014f6fc
commit f46108aaf0

View file

@ -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 {