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

xlibs: replace occurrences by xorg 

This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
This commit is contained in:
Vladimír Čunát 2015-09-15 11:26:18 +02:00
parent 21e3ff658a
commit 88c9f8b574
117 changed files with 406 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/functions.xml
View File

@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
targetPkgs = pkgs: (with pkgs; targetPkgs = pkgs: (with pkgs;
[ udev [ udev
alsaLib alsaLib
]) ++ (with pkgs.xlibs; ]) ++ (with pkgs.xorg;
[ libX11 [ libX11
libXcursor libXcursor
libXrandr libXrandr

2
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -106,7 +106,7 @@ in
systemd.services.display-manager.wants = [ "systemd-machined.service" ]; systemd.services.display-manager.wants = [ "systemd-machined.service" ];
systemd.services.display-manager.after = [ "systemd-machined.service" ]; systemd.services.display-manager.after = [ "systemd-machined.service" ];
systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ]; systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xorg.xhost pkgs.dbus_tools ];
services.dbus.packages = [ gdm ]; services.dbus.packages = [ gdm ];

2
nixos/modules/services/x11/display-managers/kdm.nix
View File

@ -19,7 +19,7 @@ let
''} ''}
[X-*-Core] [X-*-Core]
Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb Xrdb=${pkgs.xorg.xrdb}/bin/xrdb
SessionsDirs=${dmcfg.session.desktops} SessionsDirs=${dmcfg.session.desktops}
Session=${dmcfg.session.script} Session=${dmcfg.session.script}
FailsafeClient=${pkgs.xterm}/bin/xterm FailsafeClient=${pkgs.xterm}/bin/xterm

4
pkgs/applications/audio/audacious/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs
, gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg , gettext, dbus_glib, libxml2, libmad, xorg, alsaLib, libogg
, libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper
, mpg123, neon, faad2 , mpg123, neon, faad2
}: }:
@ -21,7 +21,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib
libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio libmad xorg.libXcomposite libogg libvorbis flac alsaLib libcdio
libcddb ffmpeg makeWrapper mpg123 neon faad2 libcddb ffmpeg makeWrapper mpg123 neon faad2
]; ];

6
pkgs/applications/audio/bristol/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }: { stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bristol-${version}"; name = "bristol-${version}";
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
xlibs.xproto xorg.xproto
]; ];
preInstall = '' preInstall = ''

6
pkgs/applications/audio/distrho/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2 { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }: , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "distrho-ports-git-2015-07-18"; name = "distrho-ports-git-2015-07-18";
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3 alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xlibs.libXinerama xlibs.libXrender ladspa-sdk xorg.libXinerama xorg.libXrender ladspa-sdk
]; ];
buildPhase = '' buildPhase = ''

4
pkgs/applications/audio/eq10q/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xlibs }: { stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "eq10q-2-${version}"; name = "eq10q-2-${version}";
version = "beta7.1"; version = "beta7.1";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";
}; };
buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence ]; buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
installFlags = '' installFlags = ''
DESTDIR=$(out) DESTDIR=$(out)

2
pkgs/applications/audio/jaaa/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xlibs, zita-alsa-pcmi }: { stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, libjack2, xorg, zita-alsa-pcmi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jaaa-${version}"; name = "jaaa-${version}";

4
pkgs/applications/audio/rkrlv2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, pkgs, fetchFromGitHub, { stdenv, pkgs, fetchFromGitHub,
automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
}; };
buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
meta = { meta = {
description = "Rakarrak effects ported to LV2"; description = "Rakarrak effects ported to LV2";

22
pkgs/applications/audio/spotify/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, dpkg, xlibs, qt4, alsaLib, makeWrapper, openssl, freetype { fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl, freetype
, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
, libgcrypt, chromium, udev, fontconfig , libgcrypt, chromium, udev, fontconfig
, dbus, expat }: , dbus, expat }:
@ -28,16 +28,16 @@ let
qt4 qt4
stdenv.cc.cc stdenv.cc.cc
udev udev
xlibs.libX11 xorg.libX11
xlibs.libXcomposite xorg.libXcomposite
xlibs.libXdamage xorg.libXdamage
xlibs.libXext xorg.libXext
xlibs.libXfixes xorg.libXfixes
xlibs.libXi xorg.libXi
xlibs.libXrandr xorg.libXrandr
xlibs.libXrender xorg.libXrender
xlibs.libXrender xorg.libXrender
xlibs.libXScrnSaver xorg.libXScrnSaver
]; ];
in in

4
pkgs/applications/audio/tetraproc/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient , expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient
, libsndfile, libxcb, xlibs , libsndfile, libxcb, xorg
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype expat libjack2 libclthreads libclxclient fftwFloat fontconfig libsndfile freetype
libxcb xlibs.libX11 xlibs.libXau xlibs.libXdmcp xlibs.libXft xlibs.libXrender libxcb xorg.libX11 xorg.libXau xorg.libXdmcp xorg.libXft xorg.libXrender
]; ];
makeFlags = [ makeFlags = [

8
pkgs/applications/editors/atom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, systemd , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd
}: }:
let let
@ -9,9 +9,9 @@ let
paths = [ paths = [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xlibs.libXcursor libcap systemd xorg.libXcursor libcap systemd
]; ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

6
pkgs/applications/editors/lighttable/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xlibs, udev , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev
}: }:
let let
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xorg.libXcomposite xorg.libXi xorg.libXfixes
]; ];
in in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

4
pkgs/applications/editors/sublime/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, glib, xlibs, cairo, gtk}: { fetchurl, stdenv, glib, xorg, cairo, gtk}:
let let
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo]; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];
in in
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";

4
pkgs/applications/editors/sublime3/default.nix
View File

@ -1,10 +1,10 @@
{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: { fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
let let
build = "3083"; build = "3083";
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango]; libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
in let in let
# package with just the binaries # package with just the binaries
sublime = stdenv.mkDerivation { sublime = stdenv.mkDerivation {

6
pkgs/applications/graphics/gimp/2.8.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
, python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gimp-2.8.14"; name = "gimp-2.8.14";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
[ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
libmng librsvg libwmf zlib libzip ghostscript aalib jasper libmng librsvg libwmf zlib libzip ghostscript aalib jasper
python pygtk libart_lgpl libexif gettext xlibs.libXpm python pygtk libart_lgpl libexif gettext xorg.libXpm
wrapPython wrapPython
]; ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
#configureFlags = [ "--disable-print" ]; #configureFlags = [ "--disable-print" ];
# "screenshot" needs this. # "screenshot" needs this.
NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib" NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl"; + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
meta = { meta = {

4
pkgs/applications/inferno/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }: { fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# Inferno is a rolling release from a mercurial repository. For the verison number # Inferno is a rolling release from a mercurial repository. For the verison number
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
}; };
# Fails with gcc48 due to inferno triggering an optimisation issue with floating point. # Fails with gcc48 due to inferno triggering an optimisation issue with floating point.
buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ]; buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];
infernoWrapper = ./inferno; infernoWrapper = ./inferno;

10
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -174,7 +174,7 @@ let
libvncserver libical networkmanager openal opencv libvncserver libical networkmanager openal opencv
openexr perl phonon pkgconfig polkit_qt4 prison python qca2 openexr perl phonon pkgconfig polkit_qt4 prison python qca2
qimageblitz qjson qt4 samba saneBackends soprano speechd qimageblitz qjson qt4 samba saneBackends soprano speechd
strigi taglib udev xlibs xplanet xscreensaver xz; strigi taglib udev xorg xplanet xscreensaver xz;
alsa = alsaLib; alsa = alsaLib;
assuan = libassuan; assuan = libassuan;
boost = boost156; boost = boost156;
@ -289,7 +289,7 @@ let
kde-wallpapers = kde4Package super.kde-wallpapers; kde-wallpapers = kde4Package super.kde-wallpapers;
kde-workspace = extendDerivation (kde4Package super.kde-workspace) { kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
buildInputs = with scope.xlibs; [ buildInputs = with scope.xorg; [
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
]; ];
nativeBuildInputs = [ scope.pkgconfig ]; nativeBuildInputs = [ scope.pkgconfig ];
@ -385,7 +385,7 @@ let
}; };
kmousetool = extendDerivation (kde4Package super.kmousetool) { kmousetool = extendDerivation (kde4Package super.kmousetool) {
buildInputs = with scope.xlibs; [ libXtst libXt ]; buildInputs = with scope.xorg; [ libXtst libXt ];
}; };
kmouth = kde4Package super.kmouth; kmouth = kde4Package super.kmouth;
@ -407,13 +407,13 @@ let
krdc = kde4Package super.krdc; krdc = kde4Package super.krdc;
kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) { kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
buildInputs = [ scope.xlibs.libXtst ]; buildInputs = [ scope.xorg.libXtst ];
}; };
kreversi = kde4Package super.kreversi; kreversi = kde4Package super.kreversi;
krfb = extendDerivation (kde4Package super.krfb) { krfb = extendDerivation (kde4Package super.krfb) {
buildInputs = with scope; [ xlibs.libXtst ktp-common-internals ]; buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];
}; };
ksaneplugin = kde4Package super.ksaneplugin; ksaneplugin = kde4Package super.ksaneplugin;

6
pkgs/applications/misc/evilvte/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, makeWrapper, pkgconfig, { stdenv, fetchgit, makeWrapper, pkgconfig,
gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
configH configH
}: }:
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11
xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
]; ];
buildPhase = '' buildPhase = ''

4
pkgs/applications/misc/finalterm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchgit, makeWrapper { stdenv, lib, fetchgit, makeWrapper
, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc , pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
, keybinder3, clutter_gtk, libnotify , keybinder3, clutter_gtk, libnotify
, libxkbcommon, xlibs, udev , libxkbcommon, xorg, udev
, bashInteractive , bashInteractive
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
libxkbcommon libxkbcommon
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
udev udev

4
pkgs/applications/misc/keepassx/2.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: { stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "keepassx2-2.0beta2"; name = "keepassx2-2.0beta2";
@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"; sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q";
}; };
buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
meta = { meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions"; description = "Qt password manager compatible with its Win32 and Pocket PC versions";

4
pkgs/applications/misc/xcruiser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gccmakedep, xlibs }: { stdenv, fetchurl, gccmakedep, xorg }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "xcruiser-0.30"; name = "xcruiser-0.30";
@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
}; };
buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ]; buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ];
configurePhase = "xmkmf -a"; configurePhase = "xmkmf -a";

12
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL { lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
@ -39,11 +39,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi python dbus dbus_glib pango freetype fontconfig xorg.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa alsaLib nspr nss libnotify xorg.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */ hunspell libevent libstartup_notification libvpx /* cairo */
gstreamer gst_plugins_base icu libpng jemalloc gstreamer gst_plugins_base icu libpng jemalloc
libpulseaudio # only headers are needed libpulseaudio # only headers are needed

26
pkgs/applications/networking/instant-messengers/hipchat/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libtool, xlibs, freetype, fontconfig, openssl, glib { stdenv, fetchurl, libtool, xorg, freetype, fontconfig, openssl, glib
, mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid , mesa, gstreamer, gst_plugins_base, dbus, alsaLib, zlib, libuuid
, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra , libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra
, makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }: , makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }:
@ -10,18 +10,18 @@ let
rpath = stdenv.lib.makeSearchPath "lib" [ rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc stdenv.glibc
libtool libtool
xlibs.libXext xorg.libXext
xlibs.libSM xorg.libSM
xlibs.libICE xorg.libICE
xlibs.libX11 xorg.libX11
xlibs.libXft xorg.libXft
xlibs.libXau xorg.libXau
xlibs.libXdmcp xorg.libXdmcp
xlibs.libXrender xorg.libXrender
xlibs.libXfixes xorg.libXfixes
xlibs.libXcomposite xorg.libXcomposite
xlibs.libxcb xorg.libxcb
xlibs.libXi xorg.libXi
freetype freetype
fontconfig fontconfig
openssl openssl

4
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
, xorg, fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null , xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
, libredirect, quazip, less, which, unzip , libredirect, quazip, less, which, unzip
}: }:
@ -12,7 +12,7 @@ let
deps = deps =
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
xlibs.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
]; ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {

10
pkgs/applications/networking/instant-messengers/viber/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5Full, gstreamer, zlib, sqlite, libxslt }: { fetchurl, stdenv, dpkg, makeWrapper, xorg, qt5Full, gstreamer, zlib, sqlite, libxslt }:
assert stdenv.system == "x86_64-linux"; assert stdenv.system == "x86_64-linux";
@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath [ libPath = stdenv.lib.makeLibraryPath [
qt5Full qt5Full
xlibs.libX11 xorg.libX11
gstreamer gstreamer
zlib zlib
sqlite sqlite
xlibs.libXrender xorg.libXrender
libxslt libxslt
stdenv.cc.cc stdenv.cc.cc
xlibs.libXScrnSaver xorg.libXScrnSaver
xlibs.libXext xorg.libXext
]; ];
installPhase = '' installPhase = ''

12
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL { stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL
, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
[ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi python dbus dbus_glib pango freetype fontconfig xorg.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa alsaLib nspr nss libnotify xorg.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification cairo icu hunspell libevent libstartup_notification cairo icu
] ++ [ m4 ]; ] ++ [ m4 ];

4
pkgs/applications/office/mendeley/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, dpkg, makeWrapper, which { fetchurl, stdenv, dpkg, makeWrapper, which
,gcc, xlibs, qt4, zlib ,gcc, xorg, qt4, zlib
, ...}: , ...}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
@ -24,7 +24,7 @@ let
deps = [ deps = [
gcc.cc gcc.cc
qt4 qt4
xlibs.libX11 xorg.libX11
zlib zlib
]; ];

2
pkgs/applications/office/zotero/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }: { stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
let let

4
pkgs/applications/science/math/mathematica/9.nix
View File

@ -12,7 +12,7 @@
, opencv , opencv
, openssl , openssl
, unixODBC , unixODBC
, xlibs , xorg
, zlib , zlib
}: }:
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
opencv opencv
openssl openssl
unixODBC unixODBC
] ++ (with xlibs; [ ] ++ (with xorg; [
libX11 libX11
libXext libXext
libXtst libXtst

4
pkgs/applications/science/math/mathematica/default.nix
View File

@ -12,7 +12,7 @@
, opencv , opencv
, openssl , openssl
, unixODBC , unixODBC
, xlibs , xorg
, zlib , zlib
, libxml2 , libxml2
, libuuid , libuuid
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
unixODBC unixODBC
libxml2 libxml2
libuuid libuuid
] ++ (with xlibs; [ ] ++ (with xorg; [
libX11 libX11
libXext libXext
libXtst libXtst

4
pkgs/applications/science/misc/openmodelica/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison,
doxygen, boost, openscenegraph, gnome, pangox_compat, xlibs, git, bash, gtk, makeWrapper }: doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }:
let let
@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison
doxygen boost openscenegraph gnome.gtkglext pangox_compat xlibs.libXmu doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu
git gtk makeWrapper]; git gtk makeWrapper];
patchPhase = '' patchPhase = ''

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -51,13 +51,13 @@ rec {
qgit = import ./qgit { qgit = import ./qgit {
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit (xlibs) libXext libX11; inherit (xorg) libXext libX11;
qt = qt4; qt = qt4;
}; };
qgitGit = import ./qgit/qgit-git.nix { qgitGit = import ./qgit/qgit-git.nix {
inherit fetchurl sourceFromHead stdenv; inherit fetchurl sourceFromHead stdenv;
inherit (xlibs) libXext libX11; inherit (xorg) libXext libX11;
qt = qt4; qt = qt4;
}; };

6
pkgs/applications/video/tvtime/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, xlibs, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, {stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau,
libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext,
pkgconfig, kernel, file, libXi}: pkgconfig, kernel, file, libXi}:
@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = '' configureFlags = ''
--x-includes=${xlibs.libX11}/include --x-includes=${xorg.libX11}/include
--x-libraries=${xlibs.libX11}/lib --x-libraries=${xorg.libX11}/lib
''; '';
buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ]; buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ];

4
pkgs/applications/video/vlc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray { stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray
, zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibsWrapper xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libdc1394 libraw1394 libopus libebml libmatroska libvdpau
] ]
++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ (if withQt5 then with qt5; [ base ] else [qt4])

6
pkgs/applications/video/xine-ui/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, xlibs, libpng, xineLib, readline, ncurses, curl {stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl
, lirc, shared_mime_info, libjpeg }: , lirc, shared_mime_info, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ xineLib libpng readline ncurses curl lirc libjpeg [ xineLib libpng readline ncurses curl lirc libjpeg
xlibs.xlibsWrapper xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto
xlibs.libXinerama xlibs.libXi xlibs.libXft xorg.libXinerama xorg.libXi xorg.libXft
]; ];
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';

4
pkgs/applications/virtualization/xen/generic.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl { stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
, lvm2, utillinux, procps, texinfo, perl, pythonPackages , lvm2, utillinux, procps, texinfo, perl, pythonPackages
, glib, bridge-utils, xlibs, pixman, iproute, udev, bison , glib, bridge-utils, xorg, pixman, iproute, udev, bison
, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
, spice_protocol, usbredir, alsaLib, quilt , spice_protocol, usbredir, alsaLib, quilt
@ -66,7 +66,7 @@ stdenv.mkDerivation {
[ which zlib pkgconfig SDL openssl libuuid gettext ncurses [ which zlib pkgconfig SDL openssl libuuid gettext ncurses
dev86 iasl pciutils bzip2 xz texinfo perl yajl dev86 iasl pciutils bzip2 xz texinfo perl yajl
pythonPackages.python pythonPackages.wrapPython pythonPackages.python pythonPackages.wrapPython
glib bridge-utils pixman iproute udev bison xlibs.libX11 glib bridge-utils pixman iproute udev bison xorg.libX11
flex ocaml ocamlPackages.findlib figlet libaio flex ocaml ocamlPackages.findlib figlet libaio
checkpolicy pythonPackages.markdown transfig checkpolicy pythonPackages.markdown transfig
glusterfs acl cmake spice spice_protocol usbredir glusterfs acl cmake spice spice_protocol usbredir

20
pkgs/applications/window-managers/awesome/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf { stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
, xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
, which, dbus, nettools, git, asciidoc, doxygen , which, dbus, nettools, git, asciidoc, doxygen
@ -46,15 +46,15 @@ stdenv.mkDerivation rec {
pango pango
pkgconfig pkgconfig
xcb-util-cursor xcb-util-cursor
xlibs.libXau xorg.libXau
xlibs.libXdmcp xorg.libXdmcp
xlibs.libxcb xorg.libxcb
xlibs.libxshmfence xorg.libxshmfence
xlibs.xcbutil xorg.xcbutil
xlibs.xcbutilimage xorg.xcbutilimage
xlibs.xcbutilkeysyms xorg.xcbutilkeysyms
xlibs.xcbutilrenderutil xorg.xcbutilrenderutil
xlibs.xcbutilwm xorg.xcbutilwm
#xmlto docbook_xml_dtd_45 docbook_xsl #xmlto docbook_xml_dtd_45 docbook_xsl
]; ];

8
pkgs/applications/window-managers/qtile/default.nix
View File

@ -17,20 +17,20 @@ buildPythonPackage rec {
substituteInPlace libqtile/manager.py --subst-var-by out $out substituteInPlace libqtile/manager.py --subst-var-by out $out
''; '';
buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
cairocffi-xcffib = python27Packages.cairocffi.override { cairocffi-xcffib = python27Packages.cairocffi.override {
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
pythonPath = [ python27Packages.xcffib ]; pythonPath = [ python27Packages.xcffib ];
}; };
pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ];
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib"; LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
postInstall = '' postInstall = ''
wrapProgram $out/bin/qtile \ wrapProgram $out/bin/qtile \
--prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \
--prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \
--prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \
--prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib

4
pkgs/data/documentation/zeal/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }: { stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.1.1"; version = "0.1.1";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
]; ];
configurePhase = '' configurePhase = ''

16
pkgs/desktops/e19/efl.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-libav libpulseaudio libsndfile xlibs.libXcursor xlibs.printproto gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
xlibs.libX11 udev utillinuxCurses ]; xorg.libX11 udev utillinuxCurses ];
propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite
xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm
libinput ]; libinput ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
"ac_ct_CXX=foo" ]; "ac_ct_CXX=foo" ];
NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
patches = [ ./efl-elua.patch ]; patches = [ ./efl-elua.patch ];

6
pkgs/desktops/e19/enlightenment.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 { stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2
, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi";
}; };
buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb
xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2
libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ];
preConfigure = '' preConfigure = ''

4
pkgs/desktops/enlightenment/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xlibs, dbus, imlib2, freetype }: { stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }:
let version = "0.16.8.15"; in let version = "0.16.8.15"; in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +10,7 @@ let version = "0.16.8.15"; in
}; };
buildInputs = [pkgconfig imlib2 freetype buildInputs = [pkgconfig imlib2 freetype
xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft ]; xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ];
meta = { meta = {
description = "Desktop shell built on the Enlightenment Foundation Libraries"; description = "Desktop shell built on the Enlightenment Foundation Libraries";

4
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xlibs }: { stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkglext-1.2.0"; name = "gtkglext-1.2.0";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n"; sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n";
}; };
buildInputs = with xlibs; buildInputs = with xorg;
[ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ]; [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ];
# The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and

4
pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango { stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
, gnome_vfs, libgnome_keyring, libglade }: , gnome_vfs, libgnome_keyring, libglade }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = buildInputs =
[ xlibs.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ]; [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];
propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
} }

20
pkgs/desktops/plasma-5.3/default.nix
View File

@ -128,7 +128,7 @@ let
freetype glib gnugrep gnused gtk2 gtk3 libinput libssh freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
modemmanager openconnect openexr pam pango qt4 samba modemmanager openconnect openexr pam pango qt4 samba
socat substituteAll taglib utillinux wayland xapian socat substituteAll taglib utillinux wayland xapian
xkeyboard_config xlibs xorg; xkeyboard_config xorg;
boost = boost156; boost = boost156;
canberra = libcanberra; canberra = libcanberra;
epub = ebook_tools; epub = ebook_tools;
@ -157,7 +157,7 @@ let
breeze-qt4 = overrideDerivation super.breeze (drv: { breeze-qt4 = overrideDerivation super.breeze (drv: {
name = "breeze-qt4-${version}"; name = "breeze-qt4-${version}";
buildInputs = [ pkgs.xlibs.xproto pkgs.kde4.kdelibs pkgs.qt4 ]; buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ]; nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ];
cmakeFlags = [ cmakeFlags = [
"-DUSE_KDE4=ON" "-DUSE_KDE4=ON"
@ -194,18 +194,18 @@ let
}; };
kwin = extendDerivation super.kwin { kwin = extendDerivation super.kwin {
buildInputs = with scope.xlibs; [ libICE libSM libXcursor ]; buildInputs = with scope.xorg; [ libICE libSM libXcursor ];
patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ]; patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
}; };
libkscreen = extendDerivation super.libkscreen { libkscreen = extendDerivation super.libkscreen {
buildInputs = [ scope.xlibs.libXrandr]; buildInputs = [ scope.xorg.libXrandr];
}; };
plasma-desktop = extendDerivation super.plasma-desktop { plasma-desktop = extendDerivation super.plasma-desktop {
buildInputs = with scope; buildInputs = with scope;
[ canberra ] [ canberra ]
++ (with xlibs; [ libxkbfile libXcursor libXft ]); ++ (with xorg; [ libxkbfile libXcursor libXft ]);
patches = [ patches = [
(scope.substituteAll { (scope.substituteAll {
src = ./plasma-desktop/plasma-desktop-hwclock.patch; src = ./plasma-desktop/plasma-desktop-hwclock.patch;
@ -217,13 +217,13 @@ let
xkb = scope.xkeyboard_config; xkb = scope.xkeyboard_config;
}) })
]; ];
NIX_CFLAGS_COMPILE = with scope.xlibs; NIX_CFLAGS_COMPILE = with scope.xorg;
lib.concatStringsSep " " [ lib.concatStringsSep " " [
"-I${xf86inputsynaptics}/include/xorg" "-I${xf86inputsynaptics}/include/xorg"
"-I${xf86inputevdev}/include/xorg" "-I${xf86inputevdev}/include/xorg"
"-I${xorgserver}/include/xorg" "-I${xorgserver}/include/xorg"
]; ];
cmakeFlags = with scope.xlibs; [ cmakeFlags = with scope.xorg; [
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include" "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
]; ];
@ -231,7 +231,7 @@ let
plasma-workspace = extendDerivation super.plasma-workspace { plasma-workspace = extendDerivation super.plasma-workspace {
patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ]; patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
buildInputs = with scope.xlibs; [ libSM libXcursor scope.pam ]; buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ];
inherit (scope) bash coreutils gnused gnugrep socat; inherit (scope) bash coreutils gnused gnugrep socat;
inherit (scope) kconfig kinit kservice qt5tools; inherit (scope) kconfig kinit kservice qt5tools;
@ -246,11 +246,11 @@ let
}; };
powerdevil = extendDerivation super.powerdevil { powerdevil = extendDerivation super.powerdevil {
buildInputs = [ scope.xlibs.libXrandr ]; buildInputs = [ scope.xorg.libXrandr ];
}; };
sddm-kcm = extendDerivation super.sddm-kcm { sddm-kcm = extendDerivation super.sddm-kcm {
buildInputs = [ scope.xlibs.libXcursor ]; buildInputs = [ scope.xorg.libXcursor ];
}; };
}; };

4
pkgs/development/compilers/cudatoolkit/generic.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib { lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
# generic inputs # generic inputs
, version, sha256, url ? null, ... , version, sha256, url ? null, ...
} : } :
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
runtimeDependencies = [ runtimeDependencies = [
ncurses expat python zlib glibc ncurses expat python zlib glibc
xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
gtk2 glib fontconfig freetype unixODBC alsaLib gtk2 glib fontconfig freetype unixODBC alsaLib
]; ];

8
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -13,7 +13,7 @@
, requireFile , requireFile
, unzip , unzip
, file , file
, xlibs ? null , xorg ? null
, installjdk ? true , installjdk ? true
, pluginSupport ? true , pluginSupport ? true
, installjce ? false , installjce ? false
@ -34,7 +34,7 @@
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert swingSupport -> xlibs != null; assert swingSupport -> xorg != null;
let let
@ -173,8 +173,8 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []); (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

8
pkgs/development/compilers/oraclejdk/jdk6-linux.nix
View File

@ -3,14 +3,14 @@
, requireFile , requireFile
, unzip , unzip
, makeWrapper , makeWrapper
, xlibs ? null , xorg ? null
, installjdk ? true , installjdk ? true
, pluginSupport ? true , pluginSupport ? true
, installjce ? false , installjce ? false
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert swingSupport -> xlibs != null; assert swingSupport -> xorg != null;
let let
@ -73,10 +73,10 @@ stdenv.mkDerivation {
*/ */
libraries = libraries =
[stdenv.cc.libc] ++ [stdenv.cc.libc] ++
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt] else []);
inherit swingSupport pluginSupport architecture jce; inherit swingSupport pluginSupport architecture jce;
inherit (xlibs) libX11; inherit (xorg) libX11;
mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";

2
pkgs/development/haskell-modules/default.nix
View File

@ -43,7 +43,7 @@ let
overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args; overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args;
}; };
mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope; mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope;
defaultScope = mkScope self; defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args; callPackage = drv: args: callPackageWithScope defaultScope drv args;

48
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -5309,7 +5309,7 @@ self: {
description = "A Haskell binding for GLFW"; description = "A Haskell binding for GLFW";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
"GLFW-OGL" = callPackage "GLFW-OGL" = callPackage
({ mkDerivation, base, libX11, libXrandr, mtl, OGL }: ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }:
@ -5323,7 +5323,7 @@ self: {
description = "A binding for GLFW (OGL)"; description = "A binding for GLFW (OGL)";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;}; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
"GLFW-b" = callPackage "GLFW-b" = callPackage
({ mkDerivation, base, bindings-GLFW, HUnit, test-framework ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework
@ -5388,7 +5388,7 @@ self: {
description = "Open OpenGL context windows in X11 with libX11"; description = "Open OpenGL context windows in X11 with libX11";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
"GLMatrix" = callPackage "GLMatrix" = callPackage
({ mkDerivation, base, OpenGLRaw }: ({ mkDerivation, base, OpenGLRaw }:
@ -6903,7 +6903,7 @@ self: {
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) SDL2; hg3dsdl2050 = null; }) {inherit (pkgs) SDL2; hg3dsdl2050 = null;
inherit (pkgs.xlibs) libX11;}; inherit (pkgs.xorg) libX11;};
"HGamer3D-SFML-Binding" = callPackage "HGamer3D-SFML-Binding" = callPackage
({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio
@ -16518,9 +16518,9 @@ self: {
homepage = "https://github.com/haskell-pkg-janitors/X11"; homepage = "https://github.com/haskell-pkg-janitors/X11";
description = "A binding to the X11 graphics library"; description = "A binding to the X11 graphics library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext;
inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;
inherit (pkgs.xlibs) libXrender;}; inherit (pkgs.xorg) libXrender;};
"X11-extras" = callPackage "X11-extras" = callPackage
({ mkDerivation, base, libX11, X11 }: ({ mkDerivation, base, libX11, X11 }:
@ -16536,7 +16536,7 @@ self: {
description = "Missing bindings to the X11 graphics library"; description = "Missing bindings to the X11 graphics library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) libX11;}; }) {inherit (pkgs.xorg) libX11;};
"X11-rm" = callPackage "X11-rm" = callPackage
({ mkDerivation, base, X11 }: ({ mkDerivation, base, X11 }:
@ -16588,7 +16588,7 @@ self: {
libraryPkgconfigDepends = [ libXft ]; libraryPkgconfigDepends = [ libXft ];
description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts"; description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
license = "LGPL"; license = "LGPL";
}) {inherit (pkgs.xlibs) libXft;}; }) {inherit (pkgs.xorg) libXft;};
"X11-xshape" = callPackage "X11-xshape" = callPackage
({ mkDerivation, base, X11 }: ({ mkDerivation, base, X11 }:
@ -16625,7 +16625,7 @@ self: {
description = "Bindings for the DirectX XInput library"; description = "Bindings for the DirectX XInput library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) xinput;}; }) {inherit (pkgs.xorg) xinput;};
"XMMS" = callPackage "XMMS" = callPackage
({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }:
@ -16693,7 +16693,7 @@ self: {
libraryPkgconfigDepends = [ libXau ]; libraryPkgconfigDepends = [ libXau ];
description = "A binding to the X11 authentication library"; description = "A binding to the X11 authentication library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs.xlibs) libXau;}; }) {inherit (pkgs.xorg) libXau;};
"Xec" = callPackage "Xec" = callPackage
({ mkDerivation, base, binary, bytestring, cairo, containers ({ mkDerivation, base, binary, bytestring, cairo, containers
@ -22017,7 +22017,7 @@ self: {
homepage = "http://arbtt.nomeata.de/"; homepage = "http://arbtt.nomeata.de/";
description = "Automatic Rule-Based Time Tracker"; description = "Automatic Rule-Based Time Tracker";
license = "GPL"; license = "GPL";
}) {inherit (pkgs.xlibs) libXScrnSaver;}; }) {inherit (pkgs.xorg) libXScrnSaver;};
"archive" = callPackage "archive" = callPackage
({ mkDerivation, base, bytestring, debian, debian-mirror, directory ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
@ -26520,10 +26520,10 @@ self: {
jailbreak = true; jailbreak = true;
description = "Low-level bindings to GLFW OpenGL library"; description = "Low-level bindings to GLFW OpenGL library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor;
inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;
inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama;
inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;
inherit (pkgs) mesa;}; inherit (pkgs) mesa;};
"bindings-K8055" = callPackage "bindings-K8055" = callPackage
@ -71956,7 +71956,7 @@ self: {
description = "Core library for hoodle"; description = "Core library for hoodle";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;}; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
"hoodle-extra" = callPackage "hoodle-extra" = callPackage
({ mkDerivation, aeson, aeson-pretty, attoparsec, base ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
@ -101655,7 +101655,7 @@ self: {
description = "Oculus Rift ffi providing head tracking data"; description = "Oculus Rift ffi providing head tracking data";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama;
inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
"oeis" = callPackage "oeis" = callPackage
@ -123173,7 +123173,7 @@ self: {
description = "A programming language for simple GUIs"; description = "A programming language for simple GUIs";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) libXft;}; }) {inherit (pkgs.xorg) libXft;};
"singleton-nats" = callPackage "singleton-nats" = callPackage
({ mkDerivation, base, singletons }: ({ mkDerivation, base, singletons }:
@ -145274,7 +145274,7 @@ self: {
description = "wxHaskell C++ wrapper"; description = "wxHaskell C++ wrapper";
license = "unknown"; license = "unknown";
hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;
inherit (pkgs) wxGTK;}; inherit (pkgs) wxGTK;};
"wxcore" = callPackage "wxcore" = callPackage
@ -145435,7 +145435,7 @@ self: {
description = "Haskell FFI bindings for X11 XInput library (-lXi)"; description = "Haskell FFI bindings for X11 XInput library (-lXi)";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs.xlibs) libXi;}; }) {inherit (pkgs.xorg) libXi;};
"x509" = callPackage "x509" = callPackage
({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
@ -146584,8 +146584,8 @@ self: {
description = "A Minimalistic Text Based Status Bar"; description = "A Minimalistic Text Based Status Bar";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
}) {Xrender = null; inherit (pkgs.xlibs) libXpm; }) {Xrender = null; inherit (pkgs.xorg) libXpm;
inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;};
"xmonad" = callPackage "xmonad" = callPackage
({ mkDerivation, base, containers, directory, extensible-exceptions ({ mkDerivation, base, containers, directory, extensible-exceptions
@ -147043,7 +147043,7 @@ self: {
librarySystemDepends = [ libXtst ]; librarySystemDepends = [ libXtst ];
description = "Thin FFI bindings to X11 XTest library"; description = "Thin FFI bindings to X11 XTest library";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs.xlibs) libXtst;}; }) {inherit (pkgs.xorg) libXtst;};
"xturtle" = callPackage "xturtle" = callPackage
({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft

6
pkgs/development/interpreters/erlang/R15.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl { stdenv, fetchurl, perl, gnum4, ncurses, openssl
, makeWrapper, gnused, gawk , makeWrapper, gnused, gawk
, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }:
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
let version = "15B03"; in let version = "15B03"; in
@ -17,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl [ perl gnum4 ncurses openssl
makeWrapper makeWrapper
] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xlibs.libX11 ]; ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xorg.libX11 ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

6
pkgs/development/interpreters/erlang/R16.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl { stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper , gnused, gawk, makeWrapper
, odbcSupport ? false, unixODBC ? null , odbcSupport ? false, unixODBC ? null
, wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }:
assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
with stdenv.lib; with stdenv.lib;
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl makeWrapper [ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
++ optional odbcSupport [ unixODBC ]; ++ optional odbcSupport [ unixODBC ];
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';

6
pkgs/development/interpreters/erlang/R17.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl { stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper , gnused, gawk, makeWrapper
, odbcSupport ? false, unixODBC ? null , odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
, javacSupport ? false, openjdk ? null , javacSupport ? false, openjdk ? null
, enableHipe ? true , enableHipe ? true
}: }:
assert wxSupport -> (if stdenv.isDarwin assert wxSupport -> (if stdenv.isDarwin
then wxmac != null then wxmac != null
else mesa != null && wxGTK != null && xlibs != null); else mesa != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null; assert javacSupport -> openjdk != null;
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl makeWrapper [ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
++ optional odbcSupport [ unixODBC ] ++ optional odbcSupport [ unixODBC ]
++ optional javacSupport [ openjdk ]; ++ optional javacSupport [ openjdk ];

6
pkgs/development/interpreters/erlang/R18.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl { stdenv, fetchurl, perl, gnum4, ncurses, openssl
, gnused, gawk, makeWrapper , gnused, gawk, makeWrapper
, odbcSupport ? false, unixODBC ? null , odbcSupport ? false, unixODBC ? null
, wxSupport ? true, mesa ? null, wxGTK ? null, xlibs ? null, wxmac ? null , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
, javacSupport ? false, openjdk ? null , javacSupport ? false, openjdk ? null
, enableHipe ? true , enableHipe ? true
}: }:
assert wxSupport -> (if stdenv.isDarwin assert wxSupport -> (if stdenv.isDarwin
then wxmac != null then wxmac != null
else mesa != null && wxGTK != null && xlibs != null); else mesa != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null; assert javacSupport -> openjdk != null;
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ perl gnum4 ncurses openssl makeWrapper [ perl gnum4 ncurses openssl makeWrapper
] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xlibs.libX11 ]) ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
++ optional odbcSupport [ unixODBC ] ++ optional odbcSupport [ unixODBC ]
++ optional javacSupport [ openjdk ]; ++ optional javacSupport [ openjdk ];

4
pkgs/development/interpreters/self/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }: { fetchurl, fetchgit, stdenv, xorg, gcc44, makeWrapper, ncurses, cmake }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
}; };
# gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works. # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works.
buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ]; buildInputs = [ gcc44 ncurses xorg.libX11 xorg.libXext makeWrapper cmake ];
selfWrapper = ./self; selfWrapper = ./self;

12
pkgs/development/interpreters/xulrunner/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL { lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi python dbus dbus_glib pango freetype fontconfig xorg.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa alsaLib nspr nss libnotify xorg.pixman yasm mesa
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx cairo hunspell libevent libstartup_notification libvpx cairo
gstreamer gst_plugins_base icu gstreamer gst_plugins_base icu
]; ];

4
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xlibs, libXi { stdenv, fetchurl, python, pkgconfig, popt, atk, libX11, libICE, xorg, libXi
, intltool, dbus_glib, at_spi2_core, libSM }: , intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq"; sha256 = "1y9gfz1iz3wpja7s000f0bmyyvc6im5fcdl6bxwbz0v3qdgc9vvq";
}; };
buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi
intltool dbus_glib at_spi2_core libSM ]; intltool dbus_glib at_spi2_core libSM ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/libraries/directfb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib { stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
, enableX11 ? true, xlibs , enableX11 ? true, xorg
, enableSDL ? true, SDL }: , enableSDL ? true, SDL }:
let s = let s =
@ -20,7 +20,7 @@ stdenv.mkDerivation {
buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ] buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
++ stdenv.lib.optional enableSDL SDL ++ stdenv.lib.optional enableSDL SDL
++ stdenv.lib.optionals enableX11 (with xlibs; [ ++ stdenv.lib.optionals enableX11 (with xorg; [
xproto libX11 libXext #xextproto xproto libX11 libXext #xextproto
#renderproto libXrender #renderproto libXrender
]); ]);

4
pkgs/development/libraries/frame/default.nix
View File

@ -1,5 +1,5 @@
{ enableX11 ? true { enableX11 ? true
, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, xinput }: , stdenv, fetchurl, pkgconfig, xorg, xorgserver, xinput }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "frame-${version}"; name = "frame-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
stdenv pkgconfig stdenv pkgconfig
] ++ stdenv.lib.optional enableX11 [xlibs.xorgserver xlibs.libX11 xlibs.libXext xlibs.libXi]; ] ++ stdenv.lib.optional enableX11 [xorg.xorgserver xorg.libX11 xorg.libXext xorg.libXi];
configureFlags = stdenv.lib.optional enableX11 "--with-x11"; configureFlags = stdenv.lib.optional enableX11 "--with-x11";

4
pkgs/development/libraries/geis/default.nix
View File

@ -1,5 +1,5 @@
{ enableX11 ? true { enableX11 ? true
, stdenv, fetchurl, pkgconfig, xlibs, xorgserver, python3, dbus_libs, frame, grail }: , stdenv, fetchurl, pkgconfig, xorg, xorgserver, python3, dbus_libs, frame, grail }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geis-${version}"; name = "geis-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ pkgconfig python3 dbus_libs frame grail ] buildInputs = [ pkgconfig python3 dbus_libs frame grail ]
++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.xorgserver]; ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.xorgserver];
configureFlags = stdenv.lib.optional enableX11"--enable-x11"; configureFlags = stdenv.lib.optional enableX11"--enable-x11";

4
pkgs/development/libraries/grail/default.nix
View File

@ -1,5 +1,5 @@
{ enableX11 ? true, { enableX11 ? true,
stdenv, fetchurl, pkgconfig, xlibs, python3, frame }: stdenv, fetchurl, pkgconfig, xorg, python3, frame }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grail-${version}"; name = "grail-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ pkgconfig python3 frame ] buildInputs = [ pkgconfig python3 frame ]
++ stdenv.lib.optional enableX11 [xlibs.libX11 xlibs.libXtst xlibs.libXext xlibs.libXi xlibs.libXfixes]; ++ stdenv.lib.optional enableX11 [xorg.libX11 xorg.libXtst xorg.libXext xorg.libXi xorg.libXfixes];
configureFlags = stdenv.lib.optional enableX11 "--with-x11"; configureFlags = stdenv.lib.optional enableX11 "--with-x11";

4
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, python, gstreamer, xlibs, alsaLib, cdparanoia { fetchurl, stdenv, pkgconfig, python, gstreamer, xorg, alsaLib, cdparanoia
, libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc , libogg, libtheora, libvorbis, freetype, pango, liboil, glib, cairo, orc
, libintlOrEmpty , libintlOrEmpty
, # Whether to build no plugins that have external dependencies , # Whether to build no plugins that have external dependencies
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
# can't build alsaLib on darwin # can't build alsaLib on darwin
++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib
++ stdenv.lib.optionals (!minimalDeps) ++ stdenv.lib.optionals (!minimalDeps)
[ xlibs.xlibsWrapper xlibs.libXv libogg libtheora libvorbis freetype pango [ xorg.xlibsWrapper xorg.libXv libogg libtheora libvorbis freetype pango
liboil ] liboil ]
# can't build cdparanoia on darwin # can't build cdparanoia on darwin
++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia ++ stdenv.lib.optional (!minimalDeps && !stdenv.isDarwin) cdparanoia

6
pkgs/development/libraries/gtk+/2.x.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xlibs { stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
, gdk_pixbuf, libintlOrEmpty, xlibsWrapper , gdk_pixbuf, libintlOrEmpty, xlibsWrapper
, xineramaSupport ? stdenv.isLinux , xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null , cupsSupport ? true, cups ? null
}: }:
assert xineramaSupport -> xlibs.libXinerama != null; assert xineramaSupport -> xorg.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl pkgconfig gettext ]; nativeBuildInputs = [ perl pkgconfig gettext ];
propagatedBuildInputs = with xlibs; with stdenv.lib; propagatedBuildInputs = with xorg; with stdenv.lib;
[ glib cairo pango gdk_pixbuf atk ] [ glib cairo pango gdk_pixbuf atk ]
++ optionals (stdenv.isLinux || stdenv.isDarwin) [ ++ optionals (stdenv.isLinux || stdenv.isDarwin) [
libXrandr libXrender libXcomposite libXi libXcursor libXrandr libXrender libXcomposite libXi libXcursor

6
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl { stdenv, fetchurl, pkgconfig, gettext, perl
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
, xlibs, xlibsWrapper, wayland, libxkbcommon, epoxy , xorg, xlibsWrapper, wayland, libxkbcommon, epoxy
, xineramaSupport ? stdenv.isLinux , xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux, cups ? null , cupsSupport ? stdenv.isLinux, cups ? null
}: }:
assert xineramaSupport -> xlibs.libXinerama != null; assert xineramaSupport -> xorg.libXinerama != null;
assert cupsSupport -> cups != null; assert cupsSupport -> cups != null;
let let
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
buildInputs = [ libxkbcommon epoxy ]; buildInputs = [ libxkbcommon epoxy ];
propagatedBuildInputs = with xlibs; with stdenv.lib; propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
++ optionals stdenv.isLinux [ wayland ] ++ optionals stdenv.isLinux [ wayland ]
++ optional xineramaSupport libXinerama ++ optional xineramaSupport libXinerama

2
pkgs/development/libraries/jasper/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, xlibs, libjpeg }: { stdenv, fetchurl, unzip, xorg, libjpeg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jasper-1.900.1"; name = "jasper-1.900.1";

6
pkgs/development/libraries/kde-frameworks-5.10/default.nix
View File

@ -116,7 +116,7 @@ let
{ {
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xlibs zlib; perlPackages qimageblitz xorg zlib;
boost = boost156; boost = boost156;
gif = giflib; gif = giflib;
glib2 = glib; glib2 = glib;
@ -147,7 +147,7 @@ let
}); });
frameworkintegration = extendDerivation super.frameworkintegration { frameworkintegration = extendDerivation super.frameworkintegration {
buildInputs = [ scope.xlibs.libXcursor ]; buildInputs = [ scope.xorg.libXcursor ];
}; };
kauth = extendDerivation super.kauth { kauth = extendDerivation super.kauth {
@ -164,7 +164,7 @@ let
}; };
kdelibs4support = extendDerivation super.kdelibs4support { kdelibs4support = extendDerivation super.kdelibs4support {
buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; buildInputs = [ scope.networkmanager scope.xorg.libSM ];
cmakeFlags = [ cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5" "-DDocBookXML4_DTD_VERSION=4.5"

6
pkgs/development/libraries/kde-frameworks-5.12/default.nix
View File

@ -116,7 +116,7 @@ let
{ {
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xlibs zlib; perlPackages qimageblitz xorg zlib;
boost = boost156; boost = boost156;
gif = giflib; gif = giflib;
glib2 = glib; glib2 = glib;
@ -154,7 +154,7 @@ let
}); });
frameworkintegration = extendDerivation super.frameworkintegration { frameworkintegration = extendDerivation super.frameworkintegration {
buildInputs = [ scope.xlibs.libXcursor ]; buildInputs = [ scope.xorg.libXcursor ];
}; };
kauth = extendDerivation super.kauth { kauth = extendDerivation super.kauth {
@ -171,7 +171,7 @@ let
}; };
kdelibs4support = extendDerivation super.kdelibs4support { kdelibs4support = extendDerivation super.kdelibs4support {
buildInputs = [ scope.networkmanager scope.xlibs.libSM ]; buildInputs = [ scope.networkmanager scope.xorg.libSM ];
cmakeFlags = [ cmakeFlags = [
"-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_DIR=${pkgs.docbook_xml_dtd_45}/xml/dtd/docbook"
"-DDocBookXML4_DTD_VERSION=4.5" "-DDocBookXML4_DTD_VERSION=4.5"

6
pkgs/development/libraries/libclxclient/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libclthreads, libX11, libXft, xlibs }: { stdenv, fetchurl, libclthreads, libX11, libXft, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libclxclient-${version}"; name = "libclxclient-${version}";
@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0"; sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
}; };
buildInputs = [ libclthreads libX11 libXft xlibs.xproto ]; buildInputs = [ libclthreads libX11 libXft xorg.xproto ];
NIX_CFLAGS_COMPILE = "-I${xlibs.xproto}/include -I${libXft}/include"; NIX_CFLAGS_COMPILE = "-I${xorg.xproto}/include -I${libXft}/include";
patchPhase = '' patchPhase = ''
sed -e "s@ldconfig@@" -i Makefile sed -e "s@ldconfig@@" -i Makefile

6
pkgs/development/libraries/libcm/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, xlibs, mesa}: {stdenv, fetchurl, pkgconfig, glib, xorg, mesa}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libcm-0.1.1"; name = "libcm-0.1.1";
@ -7,8 +7,8 @@ stdenv.mkDerivation {
sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn"; sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
}; };
buildInputs = [ buildInputs = [
pkgconfig glib xlibs.xlibsWrapper xlibs.libXdamage xlibs.libXcomposite pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite
xlibs.libXtst xlibs.inputproto xorg.libXtst xorg.inputproto
# !!! inputproto should really be propagated by libXtst # !!! inputproto should really be propagated by libXtst
]; ];
propagatedBuildInputs = [mesa]; propagatedBuildInputs = [mesa];

4
pkgs/development/libraries/qt-5/5.3/default.nix
View File

@ -2,7 +2,7 @@
, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng , libXfixes, freetype, fontconfig, zlib, libjpeg, libpng
, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage , gdk_pixbuf, python, gdb, xorg, libX11, libxcb, xcbutil, xcbutilimage
, xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon
, alsaLib, gstreamer, gst_plugins_base , alsaLib, gstreamer, gst_plugins_base
, libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor , libpulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor
@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
propagatedBuildInputs = [ propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xorg.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
zlib libjpeg libpng libtiff sqlite icu zlib libjpeg libpng libtiff sqlite icu
libwebp alsaLib gstreamer gst_plugins_base libpulseaudio libwebp alsaLib gstreamer gst_plugins_base libpulseaudio

4
pkgs/development/libraries/qt-5/5.4/qtbase.nix
View File

@ -1,7 +1,7 @@
{ stdenv, substituteAll { stdenv, substituteAll
, srcs, version , srcs, version
, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi , xorg, libX11, libxcb, libXcursor, libXext, libXrender, libXi
, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
, zlib, libjpeg, libpng, libtiff, sqlite, icu , zlib, libjpeg, libpng, libtiff, sqlite, icu
@ -163,7 +163,7 @@ stdenv.mkDerivation {
PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq"; PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
propagatedBuildInputs = [ propagatedBuildInputs = [
xlibs.libXcomposite libX11 libxcb libXext libXrender libXi xorg.libXcomposite libX11 libxcb libXext libXrender libXi
fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
zlib libjpeg libpng libtiff sqlite icu zlib libjpeg libpng libtiff sqlite icu
xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon

4
pkgs/development/libraries/wtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, requireFile, unzip, xlibs }: { stdenv, requireFile, unzip, xorg }:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip ]; buildInputs = [ unzip ];
libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.cc ]; libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ];
meta = { meta = {
homepage = http://java.sun.com/products/sjwtoolkit/download.html; homepage = http://java.sun.com/products/sjwtoolkit/download.html;

8
pkgs/development/libraries/xcb-util-cursor/HEAD.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig { stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig
, git, xlibs, gnum4, libxcb, gperf }: , git, xorg, gnum4, libxcb, gperf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xcb-util-cursor-0.1.1-3-gf03cc27"; name = "xcb-util-cursor-0.1.1-3-gf03cc27";
@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
libtool libtool
libxcb libxcb
pkgconfig pkgconfig
xlibs.utilmacros xorg.utilmacros
xlibs.xcbutilimage xorg.xcbutilimage
xlibs.xcbutilrenderutil xorg.xcbutilrenderutil
]; ];
configurePhase = '' configurePhase = ''

4
pkgs/development/pharo/vm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xlibs, alsaLib, cairo }: { stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
unzip ${sources40Zip} -d $prefix/lib/pharo-vm/ unzip ${sources40Zip} -d $prefix/lib/pharo-vm/
''; '';
buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ]; buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ];
meta = { meta = {
description = "Clean and innovative Smalltalk-inspired environment"; description = "Clean and innovative Smalltalk-inspired environment";

6
pkgs/development/r-modules/default.nix
View File

@ -235,7 +235,7 @@ let
ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ];
cit = [ pkgs.gsl ]; cit = [ pkgs.gsl ];
curl = [ pkgs.curl ]; curl = [ pkgs.curl ];
devEMF = [ pkgs.xlibs.libXft ]; devEMF = [ pkgs.xorg.libXft ];
diversitree = [ pkgs.gsl pkgs.fftw ]; diversitree = [ pkgs.gsl pkgs.fftw ];
EMCluster = [ pkgs.liblapack ]; EMCluster = [ pkgs.liblapack ];
fftw = [ pkgs.fftw ]; fftw = [ pkgs.fftw ];
@ -340,7 +340,7 @@ let
TAQMNGR = [ pkgs.zlib ]; TAQMNGR = [ pkgs.zlib ];
tiff = [ pkgs.libtiff ]; tiff = [ pkgs.libtiff ];
TKF = [ pkgs.gsl ]; TKF = [ pkgs.gsl ];
tkrplot = [ pkgs.xlibs.libX11 ]; tkrplot = [ pkgs.xorg.libX11 ];
topicmodels = [ pkgs.gsl ]; topicmodels = [ pkgs.gsl ];
udunits2 = [ pkgs.udunits pkgs.expat ]; udunits2 = [ pkgs.udunits pkgs.expat ];
V8 = [ pkgs.v8 ]; V8 = [ pkgs.v8 ];
@ -1632,7 +1632,7 @@ let
}); });
devEMF = old.devEMF.overrideDerivation (attrs: { devEMF = old.devEMF.overrideDerivation (attrs: {
NIX_CFLAGS_LINK = "-L${pkgs.xlibs.libXft}/lib -lXft"; NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft";
}); });
slfm = old.slfm.overrideDerivation (attrs: { slfm = old.slfm.overrideDerivation (attrs: {

8
pkgs/development/tools/electron/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xlibs, libcap, unzip , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip
, systemd , systemd
}: }:
let let
@ -9,9 +9,9 @@ let
paths = [ paths = [
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xlibs.libXcursor libcap systemd xorg.libXcursor libcap systemd
]; ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

10
pkgs/development/tools/node-webkit/nw11.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildEnv, makeWrapper { stdenv, fetchurl, buildEnv, makeWrapper
, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
, libnotify}: , libnotify}:
let let
@ -9,10 +9,10 @@ let
nwEnv = buildEnv { nwEnv = buildEnv {
name = "node-webkit-env"; name = "node-webkit-env";
paths = [ paths = [
xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
libnotify libnotify
]; ];
}; };

10
pkgs/development/tools/node-webkit/nw12.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildEnv, makeWrapper { stdenv, fetchurl, buildEnv, makeWrapper
, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
, libnotify}: , libnotify}:
let let
@ -9,10 +9,10 @@ let
nwEnv = buildEnv { nwEnv = buildEnv {
name = "nwjs-env"; name = "nwjs-env";
paths = [ paths = [
xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc
xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
libnotify libnotify
]; ];
}; };

10
pkgs/development/tools/node-webkit/nw9.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, buildEnv, makeWrapper { stdenv, fetchurl, buildEnv, makeWrapper
, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}: , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}:
let let
bits = if stdenv.system == "x86_64-linux" then "x64" bits = if stdenv.system == "x86_64-linux" then "x64"
@ -8,10 +8,10 @@ let
nwEnv = buildEnv { nwEnv = buildEnv {
name = "node-webkit-env"; name = "node-webkit-env";
paths = [ paths = [
xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf
freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc
xlibs.libXtst xlibs.libXi xorg.libXtst xorg.libXi
]; ];
}; };

4
pkgs/development/tools/selenium/server/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs { stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg
, chromedriver, chromeSupport ? true }: , chromedriver, chromeSupport ? true }:
with stdenv.lib; with stdenv.lib;
@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \ --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \
launchers/launcher-linux-${arch} launchers/launcher-linux-${arch}
${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
''; '';

8
pkgs/development/tools/thrust/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk
, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss
, xlibs, libcap, unzip , xorg, libcap, unzip
}: }:
let let
@ -8,9 +8,9 @@ let
name = "env-thrust"; name = "env-thrust";
paths = [ paths = [
stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf
cairo cups expat alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11
xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite
xlibs.libXi xlibs.libXfixes xlibs.libXrandr xlibs.libXcursor libcap xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap
]; ];
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

4
pkgs/games/adom/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio
, xlibs }: , xorg }:
assert stdenv.system == "x86_64-linux"; assert stdenv.system == "x86_64-linux";
let let
inherit (xlibs) libXext libX11; inherit (xorg) libXext libX11;
lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [
zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];

4
pkgs/games/megaglest/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua { stdenv, fetchgit, cmake, git, curl, SDL, xercesc, openal, lua
, libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
, fontconfig, freetype, xlibs, makeWrapper, bash, which, gnome3, mesa_glu , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu
, mesa_drivers }: , mesa_drivers }:
let let
version = "3.9.2"; version = "3.9.2";
lib-env = buildEnv { lib-env = buildEnv {
name = "megaglest-lib-env"; name = "megaglest-lib-env";
paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ]; stdenv.cc.cc glew mesa_glu mesa_drivers wxGTK ];
}; };

8
pkgs/games/planetaryannihilation/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, config, fetchurl, patchelf, makeWrapper, xlibs, gtk, glib, udev, alsaLib, atk { stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk
, nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }:
# TODO: use dynamic attributes once Nix 1.7 is out # TODO: use dynamic attributes once Nix 1.7 is out
@ -34,12 +34,12 @@ stdenv.mkDerivation {
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host"
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64"
for f in $out/lib/*; do for f in $out/lib/*; do
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f
done done
''; '';

4
pkgs/games/sdlmame/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xlibs }: { stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.cc}/lib" \ --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \
share/sdlmame/sdlmame share/sdlmame/sdlmame
mkdir -p "$out/bin" mkdir -p "$out/bin"

4
pkgs/games/snake4/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, shhmsg, shhopt, xlibs }: { stdenv, fetchurl, shhmsg, shhopt, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "snake4-1.0.14"; name = "snake4-1.0.14";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9"; sha256 = "14cng9l857np42zixp440mbc8y5675frb6lhsds53j1cws9cncw9";
}; };
buildInputs = with xlibs; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext]; buildInputs = with xorg; [ shhmsg shhopt libX11 libXt libXpm libXaw libXext];
preInstall = '' preInstall = ''
substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" "" substituteInPlace Makefile --replace "-o \$(OWNER) -g \$(GROUP)" ""

4
pkgs/games/spring/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
, openal, libvorbis, glew, freetype, xlibs, SDL, mesa, binutils , openal, libvorbis, glew, freetype, xorg, SDL, mesa, binutils
, asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
, jdk ? null, python ? null, systemd , jdk ? null, python ? null, systemd
, withAI ? true # support for AI Interfaces and Skirmish AIs , withAI ? true # support for AI Interfaces and Skirmish AIs
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
"-DPREFER_STATIC_LIBS:BOOL=OFF"]; "-DPREFER_STATIC_LIBS:BOOL=OFF"];
buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL
xlibs.libX11 xlibs.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper
docbook_xsl_ns systemd ] docbook_xsl_ns systemd ]
++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI jdk
++ stdenv.lib.optional withAI python; ++ stdenv.lib.optional withAI python;

36
pkgs/games/steam/chrootenv.nix
View File

@ -13,7 +13,7 @@ buildFHSUserEnv {
pkgs.python pkgs.python
pkgs.gnome2.zenity pkgs.gnome2.zenity
pkgs.xdg_utils pkgs.xdg_utils
pkgs.xlibs.xrandr pkgs.xorg.xrandr
pkgs.which pkgs.which
] ]
++ lib.optional (config.steam.java or false) pkgs.jdk ++ lib.optional (config.steam.java or false) pkgs.jdk
@ -28,23 +28,23 @@ buildFHSUserEnv {
pkgs.pango pkgs.pango
pkgs.freetype pkgs.freetype
pkgs.xlibs.libICE pkgs.xorg.libICE
pkgs.xlibs.libSM pkgs.xorg.libSM
pkgs.xlibs.libX11 pkgs.xorg.libX11
pkgs.xlibs.libXau pkgs.xorg.libXau
pkgs.xlibs.libxcb pkgs.xorg.libxcb
pkgs.xlibs.libXcursor pkgs.xorg.libXcursor
pkgs.xlibs.libXdamage pkgs.xorg.libXdamage
pkgs.xlibs.libXdmcp pkgs.xorg.libXdmcp
pkgs.xlibs.libXext pkgs.xorg.libXext
pkgs.xlibs.libXfixes pkgs.xorg.libXfixes
pkgs.xlibs.libXi pkgs.xorg.libXi
pkgs.xlibs.libXinerama pkgs.xorg.libXinerama
pkgs.xlibs.libXrandr pkgs.xorg.libXrandr
pkgs.xlibs.libXrender pkgs.xorg.libXrender
pkgs.xlibs.libXScrnSaver pkgs.xorg.libXScrnSaver
pkgs.xlibs.libXtst pkgs.xorg.libXtst
pkgs.xlibs.libXxf86vm pkgs.xorg.libXxf86vm
pkgs.ffmpeg pkgs.ffmpeg
pkgs.libpng12 pkgs.libpng12

4
pkgs/games/ue4demos/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, patchelf, xlibs, openal }: { stdenv, fetchurl, unzip, patchelf, xorg, openal }:
assert stdenv.isLinux; assert stdenv.isLinux;
assert stdenv.isx86_64; assert stdenv.isx86_64;
@ -11,7 +11,7 @@ let
buildInputs = [ unzip patchelf ]; buildInputs = [ unzip patchelf ];
rtdeps = stdenv.lib.makeLibraryPath rtdeps = stdenv.lib.makeLibraryPath
[ xlibs.libXxf86vm xlibs.libXext openal ] [ xorg.libXxf86vm xorg.libXext openal ]
+ ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ]; + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ];
buildCommand = buildCommand =

4
pkgs/games/ut2004demo/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, xlibs, mesa}: {stdenv, fetchurl, xorg, mesa}:
assert stdenv.system == "i686-linux"; assert stdenv.system == "i686-linux";
@ -17,7 +17,7 @@ let {
name = raw.name; name = raw.name;
builder = ./make-wrapper.sh; builder = ./make-wrapper.sh;
inherit raw mesa; inherit raw mesa;
inherit (xlibs) libX11 libXext; inherit (xorg) libX11 libXext;
}; };
} }

2
pkgs/games/zoom/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: { stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }:
# !!! assert freetype == xlibs.freetype # !!! assert freetype == xorg.freetype
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zoom-1.1.5"; name = "zoom-1.1.5";

2
pkgs/misc/emulators/wine/base.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [ nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
]) ++ (with pkgs.xlibs; [ ]) ++ (with pkgs.xorg; [
xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
])); ]));

4
pkgs/misc/screensavers/electricsheep/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}: {stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "electricsheep-2.6.8"; name = "electricsheep-2.6.8";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
}; };
buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibsWrapper xlibs.libXv]; buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv];
preInstall = '' preInstall = ''
installFlags=GNOME_DATADIR=$out installFlags=GNOME_DATADIR=$out

4
pkgs/misc/themes/qtcurve/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools { stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools
, gtk2, kde_workspace, kdelibs # Toolkit dependencies , gtk2, kde_workspace, kdelibs # Toolkit dependencies
, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies , libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -20,7 +20,7 @@ stdenv.mkDerivation {
libXdmcp libXdmcp
libxcb libxcb
pkgconfig pkgconfig
xlibs.libxshmfence xorg.libxshmfence
]; ];
patches = [ patches = [

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 , mesa # for fgl_glxgears
, libXxf86vm, xf86vidmodeproto # for fglrx_gamma , libXxf86vm, xf86vidmodeproto # for fglrx_gamma
, xorg, makeWrapper, glibc, patchelf , xorg, makeWrapper, glibc, patchelf
@ -48,8 +48,8 @@ stdenv.mkDerivation {
patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
buildInputs = buildInputs =
[ xlibs.libXext xlibs.libX11 xlibs.libXinerama [ xorg.libXext xorg.libX11 xorg.libXinerama
xlibs.libXrandr which imake makeWrapper xorg.libXrandr which imake makeWrapper
patchelf patchelf
unzip unzip
mesa mesa

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 , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
@ -43,14 +43,14 @@ stdenv.mkDerivation {
dontStrip = true; dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib]; 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 gtkPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf cairo ] ); [ gtk atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ]; programPath = makeLibraryPath [ xorg.libXv ];
buildInputs = [ perl nukeReferences ]; 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 , gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences
, # Whether to build the libraries only (i.e. not the kernel module or , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
@ -46,14 +46,14 @@ stdenv.mkDerivation {
dontStrip = true; dontStrip = true;
glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr];
cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; cudaPath = makeLibraryPath [zlib stdenv.cc.cc];
openclPath = makeLibraryPath [zlib]; 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 gtkPath = optionalString (!libsOnly) (makeLibraryPath
[ gtk atk pango glib gdk_pixbuf cairo ] ); [ gtk atk pango glib gdk_pixbuf cairo ] );
programPath = makeLibraryPath [ xlibs.libXv ]; programPath = makeLibraryPath [ xorg.libXv ];
buildInputs = [ perl nukeReferences ]; 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 let
@ -30,11 +30,11 @@ stdenv.mkDerivation {
dontStrip = true; 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]; 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 = { meta = {
homepage = http://www.nvidia.com/object/unix.html; 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 , gtk, atk, pango, glib, gdk_pixbuf
, # Whether to build the libraries only (i.e. not the kernel module or , # Whether to build the libraries only (i.e. not the kernel module or
# nvidia-settings). Used to support 32-bit binaries on 64-bit # nvidia-settings). Used to support 32-bit binaries on 64-bit
@ -36,12 +36,12 @@ stdenv.mkDerivation {
dontStrip = true; 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]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); [ gtk atk pango glib gdk_pixbuf xorg.libXv ] );
buildInputs = [ perl ]; buildInputs = [ perl ];

Some files were not shown because too many files have changed in this diff Show More