public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-19 18:24:24 +02:00
parent 9f208b5d8a e7e5aaa0b9
commit 8213ff161c
294 changed files with 61697 additions and 32101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/graphics/glmark2/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
python27, wayland, libudev, mesa_noglu }:
python27, wayland, udev, mesa_noglu }:
stdenv.mkDerivation rec {
name = "glmark2-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland libudev mesa_noglu
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu
];
buildPhase = ''

4
pkgs/tools/graphics/gromit-mpx/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig
, gtk, glib, pcre, libappindicator, libpthreadstubs, libXdmcp
, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu-glib
, libxkbcommon, epoxy, at-spi2-core, dbus, libdbusmenu
}:
stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
autoconf automake autoreconfHook
gtk glib pcre libappindicator libpthreadstubs
libXdmcp libxkbcommon epoxy at-spi2-core
dbus libdbusmenu-glib
dbus libdbusmenu
];
meta = with stdenv.lib; {

4
pkgs/tools/graphics/luxcorerender/default.nix
View File

@@ -3,7 +3,7 @@
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre
, bison, flex, libpthreadstubs, libX11
, embree2, makeWrapper, gsettings_desktop_schemas, glib
, embree2, makeWrapper, gsettings-desktop-schemas, glib
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp
}:
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon
epoxy at-spi2-core dbus doxygen
# needed for GSETTINGS_SCHEMAS_PATH
gsettings_desktop_schemas glib gnome3.gtk
gsettings-desktop-schemas glib gnome3.gtk
# needed for XDG_ICON_DIRS
gnome3.defaultIconTheme
makeWrapper

6
pkgs/tools/graphics/povray/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoconf, automake, boost
, zlib, libpng, libjpeg, libtiff, x11, SDL
, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff x11 SDL ];
buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "COMPILED_BY='nix'" "--with-boost-thread=boost_thread" "--with-x" ];
enableParallelBuilding = true;
preInstall = ''
mkdir "$TMP/bin"
for i in chown chgrp; do

4
pkgs/tools/graphics/vulkan-tools/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, python3, vulkan-loader,
glslang, pkgconfig, x11, libxcb, libXrandr, wayland }:
glslang, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
stdenv.mkDerivation rec {
name = "vulkan-tools-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake python3 vulkan-loader x11 libxcb libXrandr wayland ];
buildInputs = [ cmake python3 vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
enableParallelBuilding = true;
cmakeFlags = [ "-DBUILD_ICD=OFF" "-DGLSLANG_INSTALL_DIR=${glslang}" ];