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

Merge: xlibs and x11 attribute cleanup

Browse Source 
Frequently using multiple *almost* identical attributes is bad.
This commit is contained in:
Vladimír Čunát
2015-09-23 10:38:44 +02:00
parent 6b0add86b9 eb09b1fd85
commit 76ef7a93e3
192 changed files with 566 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, which, imake
{ stdenv, fetchurl, kernel ? null, which, imake
, mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf
@@ -48,8 +48,8 @@ stdenv.mkDerivation {
patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
buildInputs =
[ xlibs.libXext xlibs.libX11 xlibs.libXinerama
xlibs.libXrandr which imake makeWrapper
[ xorg.libXext xorg.libX11 xorg.libXinerama
xorg.libXrandr which imake makeWrapper
patchelf
unzip
mesa

6
pkgs/os-specific/linux/conky/default.nix
View File

@@ -9,7 +9,7 @@
# optional features with extra dependencies
, ncursesSupport ? true , ncurses ? null
, x11Support ? true , x11 ? null
, x11Support ? true , xlibsWrapper ? null
, xdamageSupport ? x11Support, libXdamage ? null
, imlib2Support ? x11Support, imlib2 ? null
@@ -29,7 +29,7 @@
assert ncursesSupport -> ncurses != null;
assert x11Support -> x11 != null;
assert x11Support -> xlibsWrapper != null;
assert xdamageSupport -> x11Support && libXdamage != null;
assert imlib2Support -> x11Support && imlib2 != null;
assert luaSupport -> lua != null;
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig glib cmake ]
++ optional ncursesSupport ncurses
++ optional x11Support x11
++ optional x11Support xlibsWrapper
++ optional xdamageSupport libXdamage
++ optional imlib2Support imlib2
++ optional luaSupport lua

8
pkgs/os-specific/linux/nvidia-x11/beta.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -43,14 +43,14 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc];
gtkPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ];
programPath = makeLibraryPath [ xorg.libXv ];
buildInputs = [ perl nukeReferences ];

8
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -46,14 +46,14 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc];
gtkPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ];
programPath = makeLibraryPath [ xorg.libXv ];
buildInputs = [ perl nukeReferences ];

6
pkgs/os-specific/linux/nvidia-x11/legacy173.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
let
@@ -30,11 +30,11 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ];
programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ];
meta = {
homepage = http://www.nvidia.com/object/unix.html;

6
pkgs/os-specific/linux/nvidia-x11/legacy304.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -36,12 +36,12 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
[ gtk atk pango glib gdk_pixbuf xorg.libXv ] );
buildInputs = [ perl ];

8
pkgs/os-specific/linux/nvidia-x11/legacy340.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl
{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl
, gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit
@@ -46,13 +46,13 @@ stdenv.mkDerivation {
dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib];
allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.cc];
allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc];
programPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );
[ gtk atk pango glib gdk_pixbuf xorg.libXv ] );
buildInputs = [ perl ];

4
pkgs/os-specific/linux/opengl/xorg-sys/default.nix
View File

@@ -6,11 +6,11 @@
# Of course, use of the driver in /usr/lib is highly impure. But it
# might actually work ;-)
{stdenv, xlibs, expat, libdrm}:
{stdenv, xorg, expat, libdrm}:
stdenv.mkDerivation {
name = "xorg-sys-opengl-3";
builder = ./builder.sh;
neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.cc];
neededLibs = [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc];
}