Commit d4a72a39 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

lib.platforms.mesaPlatforms: remove 

Mesa is a package like any other.  There's no reason for it to be a
special case with its platforms listed in lib, because if other
packages want to refer to mesa's platforms, they can access the
platforms from the package meta like they would for any other package.
parent 7d0d974f

lib/systems/doubles.nix

+0 −2
Original line number Diff line number Diff line
@@ -114,6 +114,4 @@ in { 
  genode        = filterDoubles predicates.isGenode;



  embedded      = filterDoubles predicates.isNone;



  mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64-linux" "powerpc64le-linux" "aarch64-darwin" "riscv64-linux"];

}

pkgs/applications/science/astronomy/gravit/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:

{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake, mesa }:



stdenv.mkDerivation rec {

  pname = "gravit";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec { 
      view in 3D and zoom in and out.

    '';



    platforms = lib.platforms.mesaPlatforms;

    inherit (mesa.meta) platforms;

    hydraPlatforms = lib.platforms.linux; # darwin times out

  };

}

pkgs/applications/science/chemistry/avogadro2/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, eigen, avogadrolibs, molequeue, hdf5

, openbabel, qttools, wrapQtAppsHook

, openbabel, qttools, wrapQtAppsHook, mesa

}:



let
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { 
    mainProgram = "avogadro2";

    maintainers = with maintainers; [ sheepforce ];

    homepage = "https://github.com/OpenChemistry/avogadroapp";

    platforms = platforms.mesaPlatforms;

    inherit (mesa.meta) platforms;

    license = licenses.bsd3;

  };

}

pkgs/development/libraries/SDL2/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
  fetchFromGitHub,

  nix-update-script,

  pkg-config,

  libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms,

  libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms,

  openglSupport ? libGLSupported,

  libGL,

  alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid,

pkgs/development/libraries/SDL_compat/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ 
, libiconv

, Cocoa

, autoSignDarwinBinariesHook

, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms

, mesa

, libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms

, openglSupport ? libGLSupported

, libGLU

}: