alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos opengl: use mesa_drivers.out

Browse source 
...instead of mesa_noglu.out. Closures of systems remain unchanged,
as both are in (and the .out output is very small anyway).
This is to make sure that we use lib*GL* that aren't slowed down by grsecurity.
This commit is contained in:
Vladimír Čunát 2016-09-24 19:17:32 +02:00
parent e2a9617185
commit c68850c6be
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/hardware/opengl.nix
View file

@ -14,7 +14,7 @@ let
name = "mesa-drivers+txc-${p.mesa_drivers.version}";
paths =
[ p.mesa_drivers
p.mesa_noglu # mainly for libGL
p.mesa_drivers.out # mainly for libGL
(if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc)
];
};

33
pkgs/development/libraries/wayland/1.9.nix Normal file
View file

@ -0,0 +1,33 @@
{ lib, stdenv, fetchurl, pkgconfig
, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
}:
# Require the optional to be enabled until upstream fixes or removes the configure flag
assert expat != null;
stdenv.mkDerivation rec {
name = "wayland-${version}";
version = "1.9.0";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
};
configureFlags = "--with-scanner --disable-documentation";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
meta = {
description = "Reference implementation of the wayland protocol";
homepage = http://wayland.freedesktop.org/;
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ codyopel wkennington ];
};
passthru.version = version;
}