From 143978a477e4891bd94be6d9fcf257f726b403cd Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 3 May 2018 00:58:11 -0500 Subject: treewide: remove platform assertions linux: readd assertion --- pkgs/games/adom/default.nix | 3 --- pkgs/games/sdlmame/default.nix | 4 +--- pkgs/games/terraria-server/default.nix | 3 +-- pkgs/games/tibia/default.nix | 1 - pkgs/games/ue4demos/default.nix | 6 +----- 5 files changed, 3 insertions(+), 14 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index fd575975fed5..9766e58c15ae 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio , xorg }: -assert stdenv.system == "x86_64-linux"; let inherit (xorg) libXext libX11; @@ -58,5 +57,3 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; }; } - - diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 947e52e1f13d..fa498b8e0411 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }: -assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; - stdenv.mkDerivation rec { version = "0.151.u0-1"; name = "sdlmame-${version}"; @@ -39,6 +37,6 @@ stdenv.mkDerivation rec { description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support"; license = "MAME"; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 1c145f6d71c0..65dc77fbf16f 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -1,5 +1,4 @@ { stdenv, lib, file, fetchurl, unzip }: -assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "terraria-server-${version}"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = http://terraria.org; description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; - platforms = platforms.linux; + platforms = ["x86_64-linux"]; license = licenses.unfree; }; } diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index e5bb211eb227..e0f9bae2e39b 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: with stdenv.lib; -assert stdenv.isi686; stdenv.mkDerivation { name = "tibia-10.90"; diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 4bac1cd1bb35..0bdb759048ad 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -1,8 +1,5 @@ { stdenv, fetchurl, unzip, patchelf, xorg, openal }: -assert stdenv.isLinux; -assert stdenv.isx86_64; - let buildDemo = { name, src }: stdenv.mkDerivation rec { @@ -47,7 +44,7 @@ let meta = { description = "Unreal Engine 4 Linux demos"; homepage = https://wiki.unrealengine.com/Linux_Demos; - platforms = stdenv.lib.platforms.linux; + platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; }; }; @@ -189,4 +186,3 @@ in { }; }; } - -- cgit v1.2.3