From 6dbcd591efc5712cc7fbdf62d66bf7db17164479 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 1 Mar 2010 12:32:40 +0000 Subject: [PATCH] use mesaplatforms from lib svn path=/nixpkgs/trunk/; revision=20302 --- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/lib/platforms.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 558291f5327..cbe52ae0e37 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, x11, xlibs, libdrm, expat }: -if stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux" && stdenv.system != "i686-darwin" && stdenv.system != "i686-freebsd" then +if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then throw "unsupported platform for Mesa" else diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index 5174476f954..6cf9d954584 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -11,5 +11,5 @@ rec { unix = linux ++ darwin ++ freebsd ++ openbsd; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; allBut = platform: lists.filter (x: platform != x) all; - mesaPlatforms = linux; + mesaPlatforms = allBut [openbsd netbsd cygwin]; }