Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
This commit is contained in:
commit
76ef7a93e3
@ -248,7 +248,7 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
|
||||
targetPkgs = pkgs: (with pkgs;
|
||||
[ udev
|
||||
alsaLib
|
||||
]) ++ (with pkgs.xlibs;
|
||||
]) ++ (with pkgs.xorg;
|
||||
[ libX11
|
||||
libXcursor
|
||||
libXrandr
|
||||
|
@ -106,7 +106,7 @@ in
|
||||
systemd.services.display-manager.wants = [ "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 ];
|
||||
|
||||
|
@ -19,7 +19,7 @@ let
|
||||
''}
|
||||
|
||||
[X-*-Core]
|
||||
Xrdb=${pkgs.xlibs.xrdb}/bin/xrdb
|
||||
Xrdb=${pkgs.xorg.xrdb}/bin/xrdb
|
||||
SessionsDirs=${dmcfg.session.desktops}
|
||||
Session=${dmcfg.session.script}
|
||||
FailsafeClient=${pkgs.xterm}/bin/xterm
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
, mpg123, neon, faad2
|
||||
}:
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs =
|
||||
[ 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
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xlibs }:
|
||||
{ stdenv, fetchurl, alsaLib, libjack2, pkgconfig, libpulseaudio, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bristol-${version}";
|
||||
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
alsaLib libjack2 pkgconfig libpulseaudio xlibs.libX11 xlibs.libXext
|
||||
xlibs.xproto
|
||||
alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
|
||||
xorg.xproto
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
|
||||
, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }:
|
||||
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "distrho-ports-git-2015-07-18";
|
||||
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
|
||||
xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
|
||||
xlibs.libXinerama xlibs.libXrender ladspa-sdk
|
||||
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
|
||||
xorg.libXinerama xorg.libXrender ladspa-sdk
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
@ -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 {
|
||||
name = "eq10q-2-${version}";
|
||||
version = "beta7.1";
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
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 = ''
|
||||
DESTDIR=$(out)
|
||||
|
@ -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 {
|
||||
name = "jaaa-${version}";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11
|
||||
{ stdenv, fetchurl, cmake, qt4, pkgconfig, xlibsWrapper
|
||||
# transports
|
||||
, curl, libmms
|
||||
# input plugins
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ # basic requirements
|
||||
cmake qt4 pkgconfig x11
|
||||
cmake qt4 pkgconfig xlibsWrapper
|
||||
# transports
|
||||
curl libmms
|
||||
# input plugins
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, pkgs, fetchFromGitHub,
|
||||
automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile
|
||||
automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
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 = {
|
||||
description = "Rakarrak effects ported to LV2";
|
||||
|
@ -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
|
||||
, libgcrypt, chromium, udev, fontconfig
|
||||
, dbus, expat }:
|
||||
@ -28,16 +28,16 @@ let
|
||||
qt4
|
||||
stdenv.cc.cc
|
||||
udev
|
||||
xlibs.libX11
|
||||
xlibs.libXcomposite
|
||||
xlibs.libXdamage
|
||||
xlibs.libXext
|
||||
xlibs.libXfixes
|
||||
xlibs.libXi
|
||||
xlibs.libXrandr
|
||||
xlibs.libXrender
|
||||
xlibs.libXrender
|
||||
xlibs.libXScrnSaver
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
];
|
||||
|
||||
in
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient
|
||||
, libsndfile, libxcb, xlibs
|
||||
, libsndfile, libxcb, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
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 = [
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
|
||||
, intltool, x11, libxklavier, libgcrypt, libaudit
|
||||
, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
|
||||
, qt4 ? null, qt5 ? null
|
||||
}:
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
|
||||
, 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
|
||||
@ -9,9 +9,9 @@ let
|
||||
paths = [
|
||||
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3
|
||||
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
|
||||
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
|
||||
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr
|
||||
xlibs.libXcursor libcap systemd
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor libcap systemd
|
||||
];
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
|
||||
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
|
||||
, alsaLib, cairo, acl, gpm
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
[ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ]
|
||||
++ stdenv.lib.optional stdenv.isLinux dbus
|
||||
++ stdenv.lib.optionals withX
|
||||
[ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
|
||||
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
|
||||
imagemagick gconf ]
|
||||
++ stdenv.lib.optional (withX && withGTK2) gtk2
|
||||
++ stdenv.lib.optional (withX && withGTK3) gtk3
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
|
||||
, 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
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
|
||||
fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
|
||||
xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst
|
||||
xlibs.libXcomposite xlibs.libXi xlibs.libXfixes
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes
|
||||
];
|
||||
in
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11, motif, libXpm }:
|
||||
{ stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
|
||||
|
||||
assert stdenv.isLinux;
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna";
|
||||
};
|
||||
|
||||
buildInputs = [ x11 motif libXpm ];
|
||||
buildInputs = [ xlibsWrapper motif libXpm ];
|
||||
|
||||
buildFlags = if stdenv.isLinux then "linux" else "";
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ fetchurl, stdenv, glib, xlibs, cairo, gtk}:
|
||||
{ fetchurl, stdenv, glib, xorg, cairo, gtk}:
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo];
|
||||
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo];
|
||||
in
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
|
@ -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";
|
||||
|
||||
let
|
||||
build = "3083";
|
||||
libPath = stdenv.lib.makeLibraryPath [glib xlibs.libX11 gtk cairo pango];
|
||||
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
|
||||
in let
|
||||
# package with just the binaries
|
||||
sublime = stdenv.mkDerivation {
|
||||
|
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl,
|
||||
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl,
|
||||
qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qgis-2.10.1";
|
||||
|
||||
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl qwt qscintilla
|
||||
buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
|
||||
fcgi libspatialindex libspatialite postgresql ] ++
|
||||
(with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, makeWrapper, fetchurl, x11, imlib2, libjpeg, libpng
|
||||
{ stdenv, makeWrapper, fetchurl, xlibsWrapper, imlib2, libjpeg, libpng
|
||||
, libXinerama, curl, libexif }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];
|
||||
buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlags="PREFIX=$out exif=1"
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
|
||||
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
|
||||
, 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 {
|
||||
name = "gimp-2.8.14";
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
[ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
|
||||
freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
|
||||
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
|
||||
];
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
#configureFlags = [ "--disable-print" ];
|
||||
|
||||
# "screenshot" needs this.
|
||||
NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib"
|
||||
NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
|
||||
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl";
|
||||
|
||||
meta = {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, makeWrapper, imake
|
||||
, x11, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:
|
||||
, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:
|
||||
|
||||
let version = "3.2.5b"; in
|
||||
stdenv.mkDerivation {
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
buildInputs = [x11 libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
|
||||
buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
|
||||
|
||||
nativeBuildInputs = [ imake makeWrapper ];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ fetchurl, fetchhg, stdenv, xlibs, gcc46, makeWrapper }:
|
||||
{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# 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.
|
||||
buildInputs = [ gcc46 xlibs.libX11 xlibs.libXpm xlibs.libXext xlibs.xextproto makeWrapper ];
|
||||
buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];
|
||||
|
||||
infernoWrapper = ./inferno;
|
||||
|
||||
|
@ -174,7 +174,7 @@ let
|
||||
libvncserver libical networkmanager openal opencv
|
||||
openexr perl phonon pkgconfig polkit_qt4 prison python qca2
|
||||
qimageblitz qjson qt4 samba saneBackends soprano speechd
|
||||
strigi taglib udev xlibs xplanet xscreensaver xz;
|
||||
strigi taglib udev xorg xplanet xscreensaver xz;
|
||||
alsa = alsaLib;
|
||||
assuan = libassuan;
|
||||
boost = boost156;
|
||||
@ -289,7 +289,7 @@ let
|
||||
kde-wallpapers = kde4Package super.kde-wallpapers;
|
||||
|
||||
kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
|
||||
buildInputs = with scope.xlibs; [
|
||||
buildInputs = with scope.xorg; [
|
||||
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
|
||||
];
|
||||
nativeBuildInputs = [ scope.pkgconfig ];
|
||||
@ -385,7 +385,7 @@ let
|
||||
};
|
||||
|
||||
kmousetool = extendDerivation (kde4Package super.kmousetool) {
|
||||
buildInputs = with scope.xlibs; [ libXtst libXt ];
|
||||
buildInputs = with scope.xorg; [ libXtst libXt ];
|
||||
};
|
||||
|
||||
kmouth = kde4Package super.kmouth;
|
||||
@ -407,13 +407,13 @@ let
|
||||
krdc = kde4Package super.krdc;
|
||||
|
||||
kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
|
||||
buildInputs = [ scope.xlibs.libXtst ];
|
||||
buildInputs = [ scope.xorg.libXtst ];
|
||||
};
|
||||
|
||||
kreversi = kde4Package super.kreversi;
|
||||
|
||||
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;
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchgit, makeWrapper, pkgconfig,
|
||||
gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs,
|
||||
gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
|
||||
configH
|
||||
}:
|
||||
|
||||
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11
|
||||
xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig
|
||||
gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11
|
||||
xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, fetchgit, makeWrapper
|
||||
, pkgconfig, cmake, libxml2, vala, intltool, libmx, gnome3, gtk3, gtk_doc
|
||||
, keybinder3, clutter_gtk, libnotify
|
||||
, libxkbcommon, xlibs, udev
|
||||
, libxkbcommon, xorg, udev
|
||||
, bashInteractive
|
||||
}:
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [
|
||||
pkgconfig cmake vala intltool gtk3 gnome3.gnome_common gnome3.libgee
|
||||
gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper
|
||||
xlibs.libpthreadstubs xlibs.libXdmcp xlibs.libxshmfence
|
||||
xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence
|
||||
libxkbcommon
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
udev
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }:
|
||||
{ stdenv, fetchurl, cmake, libgcrypt, qt4, xorg, ... }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "keepassx2-2.0beta2";
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ];
|
||||
buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
|
||||
|
||||
meta = {
|
||||
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr
|
||||
{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
|
||||
, xinput, curl, openssl, unzip }:
|
||||
|
||||
with stdenv.lib;
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl
|
||||
cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, tcl, tk, x11, makeWrapper}:
|
||||
{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
|
||||
|
||||
let version = "3.0"; in
|
||||
stdenv.mkDerivation {
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
|
||||
};
|
||||
|
||||
buildInputs = [tcl tk x11 makeWrapper];
|
||||
buildInputs = [tcl tk xlibsWrapper makeWrapper];
|
||||
|
||||
patchPhase = ''
|
||||
sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gccmakedep, xlibs }:
|
||||
{ stdenv, fetchurl, gccmakedep, xorg }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xcruiser-0.30";
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
|
||||
};
|
||||
|
||||
buildInputs = with xlibs; [ gccmakedep imake libXt libXaw libXpm libXext ];
|
||||
buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ];
|
||||
|
||||
configurePhase = "xmkmf -a";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:
|
||||
{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xfe-1.37";
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
|
||||
};
|
||||
|
||||
buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ];
|
||||
buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
|
||||
, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null
|
||||
, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null
|
||||
, base14Fonts ? null
|
||||
}:
|
||||
|
||||
assert enableGUI -> x11 != null && motif != null && freetype != null;
|
||||
assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null;
|
||||
assert enablePDFtoPPM -> freetype != null;
|
||||
assert useT1Lib -> t1lib != null;
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
buildInputs = [ zlib libpng ] ++
|
||||
stdenv.lib.optionals enableGUI [x11 motif] ++
|
||||
stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++
|
||||
stdenv.lib.optional useT1Lib t1lib ++
|
||||
stdenv.lib.optional enablePDFtoPPM freetype;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, perl, ncurses, x11, bzip2, zlib, openssl
|
||||
{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
|
||||
, spidermonkey, gpm
|
||||
, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
|
||||
, enablePython ? false, python ? null
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./gc-init.patch ];
|
||||
|
||||
buildInputs = [ perl ncurses x11 bzip2 zlib openssl spidermonkey gpm ]
|
||||
buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]
|
||||
++ stdenv.lib.optional enableGuile guile
|
||||
++ stdenv.lib.optional enablePython python;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
, hunspell, libevent, libstartup_notification, libvpx
|
||||
@ -41,11 +41,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
python dbus dbus_glib pango freetype fontconfig xorg.libXi
|
||||
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
|
||||
alsaLib nspr nss libnotify xorg.pixman yasm mesa
|
||||
xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
|
||||
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
|
||||
hunspell libevent libstartup_notification libvpx /* cairo */
|
||||
gstreamer gst_plugins_base icu libpng jemalloc
|
||||
libpulseaudio # only headers are needed
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
|
||||
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, xlibsWrapper
|
||||
, GConf, gnome_mplayer, mplayer, gmtk
|
||||
}:
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser gmtk ];
|
||||
buildInputs = [ pkgconfig glib dbus dbus_glib browser xlibsWrapper GConf browser gmtk ];
|
||||
|
||||
# !!! fix this
|
||||
preBuild =
|
||||
|
@ -3,12 +3,12 @@
|
||||
, graphicsSupport ? false
|
||||
, mouseSupport ? false
|
||||
, ncurses, openssl ? null, boehmgc, gettext, zlib
|
||||
, imlib2 ? null, x11 ? null, fbcon ? null
|
||||
, imlib2 ? null, xlibsWrapper ? null, fbcon ? null
|
||||
, gpm-ncurses ? null
|
||||
}:
|
||||
|
||||
assert sslSupport -> openssl != null;
|
||||
assert graphicsSupport -> imlib2 != null && (x11 != null || fbcon != null);
|
||||
assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null);
|
||||
assert mouseSupport -> gpm-ncurses != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ncurses boehmgc gettext zlib]
|
||||
++ stdenv.lib.optional sslSupport openssl
|
||||
++ stdenv.lib.optional mouseSupport gpm-ncurses
|
||||
++ stdenv.lib.optionals graphicsSupport [imlib2 x11 fbcon];
|
||||
++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon];
|
||||
|
||||
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
|
||||
+ stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
|
||||
{stdenv, fetchurl, which, tcl, tk, xlibsWrapper, libpng, libjpeg, makeWrapper}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "amsn-0.98.9";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
|
||||
|
||||
buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];
|
||||
buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin
|
||||
|
@ -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
|
||||
, libxml2, libxslt, sqlite, libogg, libvorbis, xz, libcanberra
|
||||
, makeWrapper, libredirect, xkeyboard_config, xcbutilkeysyms }:
|
||||
@ -10,18 +10,18 @@ let
|
||||
rpath = stdenv.lib.makeSearchPath "lib" [
|
||||
stdenv.glibc
|
||||
libtool
|
||||
xlibs.libXext
|
||||
xlibs.libSM
|
||||
xlibs.libICE
|
||||
xlibs.libX11
|
||||
xlibs.libXft
|
||||
xlibs.libXau
|
||||
xlibs.libXdmcp
|
||||
xlibs.libXrender
|
||||
xlibs.libXfixes
|
||||
xlibs.libXcomposite
|
||||
xlibs.libxcb
|
||||
xlibs.libXi
|
||||
xorg.libXext
|
||||
xorg.libSM
|
||||
xorg.libICE
|
||||
xorg.libX11
|
||||
xorg.libXft
|
||||
xorg.libXau
|
||||
xorg.libXdmcp
|
||||
xorg.libXrender
|
||||
xorg.libXfixes
|
||||
xorg.libXcomposite
|
||||
xorg.libxcb
|
||||
xorg.libXi
|
||||
freetype
|
||||
fontconfig
|
||||
openssl
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
}:
|
||||
|
||||
@ -12,7 +12,7 @@ let
|
||||
deps =
|
||||
[ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
|
||||
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 {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
|
||||
, bwidget, makeWrapper, x11
|
||||
, bwidget, makeWrapper, xlibsWrapper
|
||||
, withSitePlugins ? true
|
||||
, theme ? null
|
||||
}:
|
||||
@ -62,7 +62,7 @@ in mkTkabber (main // {
|
||||
done
|
||||
'';
|
||||
|
||||
buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries;
|
||||
buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries;
|
||||
|
||||
meta = {
|
||||
homepage = "http://tkabber.jabber.ru/";
|
||||
|
@ -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";
|
||||
|
||||
@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
qt5Full
|
||||
xlibs.libX11
|
||||
xorg.libX11
|
||||
gstreamer
|
||||
zlib
|
||||
sqlite
|
||||
xlibs.libXrender
|
||||
xorg.libXrender
|
||||
libxslt
|
||||
stdenv.cc.cc
|
||||
xlibs.libXScrnSaver
|
||||
xlibs.libXext
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXext
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
, hunspell, libevent, libstartup_notification, libvpx
|
||||
@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
|
||||
[ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
python dbus dbus_glib pango freetype fontconfig xorg.libXi
|
||||
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
|
||||
alsaLib nspr nss libnotify xorg.pixman yasm mesa
|
||||
xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
|
||||
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
|
||||
hunspell libevent libstartup_notification cairo icu
|
||||
] ++ [ m4 ];
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ fetchurl, stdenv, dpkg, makeWrapper, which
|
||||
,gcc, xlibs, qt4, zlib
|
||||
,gcc, xorg, qt4, zlib
|
||||
, ...}:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
@ -24,7 +24,7 @@ let
|
||||
deps = [
|
||||
gcc.cc
|
||||
qt4
|
||||
xlibs.libX11
|
||||
xorg.libX11
|
||||
zlib
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xlibs }:
|
||||
{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
|
||||
|
||||
let
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
, opencv
|
||||
, openssl
|
||||
, unixODBC
|
||||
, xlibs
|
||||
, xorg
|
||||
, zlib
|
||||
}:
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
opencv
|
||||
openssl
|
||||
unixODBC
|
||||
] ++ (with xlibs; [
|
||||
] ++ (with xorg; [
|
||||
libX11
|
||||
libXext
|
||||
libXtst
|
||||
|
@ -12,7 +12,7 @@
|
||||
, opencv
|
||||
, openssl
|
||||
, unixODBC
|
||||
, xlibs
|
||||
, xorg
|
||||
, zlib
|
||||
, libxml2
|
||||
, libuuid
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
unixODBC
|
||||
libxml2
|
||||
libuuid
|
||||
] ++ (with xlibs; [
|
||||
] ++ (with xorg; [
|
||||
libX11
|
||||
libXext
|
||||
libXtst
|
||||
|
@ -8,7 +8,7 @@
|
||||
, ocaml, withOCaml ? false
|
||||
#, withJava ? false
|
||||
#, atlasMath, withAtlas ? false
|
||||
, x11, withX ? false
|
||||
, xlibsWrapper, withX ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [gfortran ncurses]
|
||||
++ lib.optionals withGtk [gtk]
|
||||
++ lib.optionals withOCaml [ocaml]
|
||||
++ lib.optionals withX [x11]
|
||||
++ lib.optional withX xlibsWrapper
|
||||
;
|
||||
|
||||
|
||||
@ -58,11 +58,7 @@ stdenv.mkDerivation rec {
|
||||
# do not compile Java interface
|
||||
+ " --without-java"
|
||||
# use the X Window System
|
||||
+ (lib.optionalString withX "
|
||||
--with-x
|
||||
--x-libraries=${x11}/lib
|
||||
--x-includes=${x11}/include
|
||||
")
|
||||
+ lib.optionalString withX "--with-x"
|
||||
;
|
||||
|
||||
makeFlags = "all";
|
||||
|
@ -1,7 +1,7 @@
|
||||
{stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake,
|
||||
hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which,
|
||||
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
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
buildInputs = [autoconf cmake automake libtool gfortran clang gnumake
|
||||
hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which
|
||||
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];
|
||||
|
||||
patchPhase = ''
|
||||
|
@ -51,13 +51,13 @@ rec {
|
||||
|
||||
qgit = import ./qgit {
|
||||
inherit fetchurl stdenv;
|
||||
inherit (xlibs) libXext libX11;
|
||||
inherit (xorg) libXext libX11;
|
||||
qt = qt4;
|
||||
};
|
||||
|
||||
qgitGit = import ./qgit/qgit-git.nix {
|
||||
inherit fetchurl sourceFromHead stdenv;
|
||||
inherit (xlibs) libXext libX11;
|
||||
inherit (xorg) libXext libX11;
|
||||
qt = qt4;
|
||||
};
|
||||
|
||||
|
@ -3,7 +3,7 @@
|
||||
, gst_ffmpeg, speex
|
||||
, libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool
|
||||
, boost, freetype, agg, dbus, curl, pkgconfig, gettext
|
||||
, glib, gtk, gtkglext, pangox_compat, x11, ming, dejagnu, python, perl
|
||||
, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl
|
||||
, freefont_ttf, haxe, swftools
|
||||
, lib, makeWrapper
|
||||
, xulrunner }:
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# XXX: KDE is supported as well so we could make it available optionally.
|
||||
buildInputs = [
|
||||
gettext x11 SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
|
||||
gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good
|
||||
gst_ffmpeg speex libtool
|
||||
libogg libxml2 libjpeg mesa libpng libungif boost freetype agg
|
||||
dbus curl pkgconfig glib gtk gtkglext pangox_compat
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, which, qt4, x11, libpulseaudio, fftwSinglePrec
|
||||
{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec
|
||||
, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig
|
||||
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
|
||||
, yasm, libuuid, taglib, libtool, autoconf, automake, file
|
||||
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot = "${name}/mythtv";
|
||||
|
||||
buildInputs = [
|
||||
freetype qt4 lame zlib x11 mesa perl alsaLib libpulseaudio fftwSinglePrec
|
||||
freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec
|
||||
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
|
||||
libuuid taglib
|
||||
];
|
||||
|
@ -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,
|
||||
pkgconfig, kernel, file, libXi}:
|
||||
|
||||
@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = ''
|
||||
--x-includes=${xlibs.libX11}/include
|
||||
--x-libraries=${xlibs.libX11}/lib
|
||||
--x-includes=${xorg.libX11}/include
|
||||
--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 ];
|
||||
|
@ -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
|
||||
, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
|
||||
, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
|
||||
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
|
||||
libkate libtiger libv4l samba liboggz libass libdvbpsi libva
|
||||
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
|
||||
xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
|
||||
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
|
||||
]
|
||||
++ (if withQt5 then with qt5; [ base ] else [qt4])
|
||||
|
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ xineLib libpng readline ncurses curl lirc libjpeg
|
||||
xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
|
||||
xlibs.libXinerama xlibs.libXi xlibs.libXft
|
||||
xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto
|
||||
xorg.libXinerama xorg.libXi xorg.libXft
|
||||
];
|
||||
|
||||
patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
|
||||
|
@ -1,6 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
|
||||
libmspack, openssl, pam, xercesc, icu, libdnet, procps,
|
||||
x11, libXinerama, libXi, libXrender, libXrandr, libXtst,
|
||||
xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
|
||||
pkgconfig, glib, gtk, gtkmm }:
|
||||
|
||||
let
|
||||
@ -18,7 +18,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
buildInputs =
|
||||
[ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
|
||||
pkgconfig glib gtk gtkmm x11 libXinerama libXi libXrender libXrandr libXtst ];
|
||||
pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s,-Werror,,g configure.ac
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl
|
||||
, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
|
||||
, 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
|
||||
, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
|
||||
, spice_protocol, usbredir, alsaLib, quilt
|
||||
@ -66,7 +66,7 @@ stdenv.mkDerivation {
|
||||
[ which zlib pkgconfig SDL openssl libuuid gettext ncurses
|
||||
dev86 iasl pciutils bzip2 xz texinfo perl yajl
|
||||
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
|
||||
checkpolicy pythonPackages.markdown transfig
|
||||
glusterfs acl cmake spice spice_protocol usbredir
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
|
||||
, which, dbus, nettools, git, asciidoc, doxygen
|
||||
@ -46,15 +46,15 @@ stdenv.mkDerivation rec {
|
||||
pango
|
||||
pkgconfig
|
||||
xcb-util-cursor
|
||||
xlibs.libXau
|
||||
xlibs.libXdmcp
|
||||
xlibs.libxcb
|
||||
xlibs.libxshmfence
|
||||
xlibs.xcbutil
|
||||
xlibs.xcbutilimage
|
||||
xlibs.xcbutilkeysyms
|
||||
xlibs.xcbutilrenderutil
|
||||
xlibs.xcbutilwm
|
||||
xorg.libXau
|
||||
xorg.libXdmcp
|
||||
xorg.libxcb
|
||||
xorg.libxshmfence
|
||||
xorg.xcbutil
|
||||
xorg.xcbutilimage
|
||||
xorg.xcbutilkeysyms
|
||||
xorg.xcbutilrenderutil
|
||||
xorg.xcbutilwm
|
||||
#xmlto docbook_xml_dtd_45 docbook_xsl
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11, lua, gettext, groff }:
|
||||
{ stdenv, fetchurl, xlibsWrapper, lua, gettext, groff }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ion-3-20090110";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation {
|
||||
url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz;
|
||||
sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns";
|
||||
};
|
||||
buildInputs = [ x11 lua gettext groff ];
|
||||
buildInputs = [ xlibsWrapper lua gettext groff ];
|
||||
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
|
||||
installFlags = "PREFIX=\${out}";
|
||||
}
|
||||
|
@ -4,7 +4,7 @@
|
||||
stdenv, fetchurl,
|
||||
lua, gettext, groff,
|
||||
pkgconfig, busybox,
|
||||
x11, libXinerama, libXrandr, libX11
|
||||
xlibsWrapper, libXinerama, libXrandr, libX11
|
||||
}:
|
||||
|
||||
assert enableXft -> libXft != null;
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation {
|
||||
|
||||
patches = patches ++ stdenv.lib.optional enableXft ./notion-xft_nixos.diff;
|
||||
postPatch = "substituteInPlace system-autodetect.mk --replace '#PRELOAD_MODULES=1' 'PRELOAD_MODULES=1'";
|
||||
buildInputs = [x11 lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;
|
||||
buildInputs = [xlibsWrapper lua gettext groff pkgconfig busybox libXinerama libXrandr libX11] ++ stdenv.lib.optional enableXft libXft;
|
||||
|
||||
buildFlags = "LUA_DIR=${lua} X11_PREFIX=/no-such-path PREFIX=\${out}";
|
||||
installFlags = "PREFIX=\${out}";
|
||||
|
@ -17,20 +17,20 @@ buildPythonPackage rec {
|
||||
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 {
|
||||
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";
|
||||
LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
|
||||
pythonPath = [ python27Packages.xcffib ];
|
||||
};
|
||||
|
||||
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 = ''
|
||||
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.cairo}/lib \
|
||||
--prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
|
||||
, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
|
||||
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
|
||||
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
|
||||
, libwebp ? null, xwayland ? null
|
||||
# beware of null defaults, as the parameters *are* supplied by callPackage by default
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm
|
||||
pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
|
||||
mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
|
||||
libwebp
|
||||
];
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xlibs }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.1.1";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
xlibs.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
|
||||
xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
@ -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 {
|
||||
@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
|
||||
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
|
||||
xlibs.libX11 udev utillinuxCurses ];
|
||||
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
|
||||
xorg.libX11 udev utillinuxCurses ];
|
||||
|
||||
propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite
|
||||
xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext
|
||||
bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr
|
||||
xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit
|
||||
propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite
|
||||
xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
|
||||
bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
|
||||
xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
|
||||
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm
|
||||
libinput ];
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
"--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
|
||||
"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 ];
|
||||
|
||||
|
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
|
||||
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
|
||||
sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi";
|
||||
};
|
||||
buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb
|
||||
xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2
|
||||
buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb
|
||||
xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2
|
||||
libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
|
||||
NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ];
|
||||
preConfigure = ''
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, x11, xlibs, dbus, imlib2, freetype }:
|
||||
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }:
|
||||
|
||||
let version = "0.16.8.15"; in
|
||||
stdenv.mkDerivation {
|
||||
@ -10,7 +10,7 @@ let version = "0.16.8.15"; in
|
||||
};
|
||||
|
||||
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 = {
|
||||
description = "Desktop shell built on the Enlightenment Foundation Libraries";
|
||||
|
@ -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 {
|
||||
name = "gtkglext-1.2.0";
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0lbz96jwz57hnn52b8rfj54inwpwcc9fkdq6ya043cgnfih77g8n";
|
||||
};
|
||||
|
||||
buildInputs = with xlibs;
|
||||
buildInputs = with xorg;
|
||||
[ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ];
|
||||
|
||||
# The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
|
||||
{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango
|
||||
, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
|
||||
, gnome_vfs, libgnome_keyring, libglade }:
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool ];
|
||||
buildInputs =
|
||||
[ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ];
|
||||
[ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];
|
||||
|
||||
propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
|
||||
}
|
||||
|
@ -128,7 +128,7 @@ let
|
||||
freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
|
||||
modemmanager openconnect openexr pam pango qt4 samba
|
||||
socat substituteAll taglib utillinux wayland xapian
|
||||
xkeyboard_config xlibs xorg;
|
||||
xkeyboard_config xorg;
|
||||
boost = boost156;
|
||||
canberra = libcanberra;
|
||||
epub = ebook_tools;
|
||||
@ -157,7 +157,7 @@ let
|
||||
|
||||
breeze-qt4 = overrideDerivation super.breeze (drv: {
|
||||
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 ];
|
||||
cmakeFlags = [
|
||||
"-DUSE_KDE4=ON"
|
||||
@ -194,18 +194,18 @@ let
|
||||
};
|
||||
|
||||
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 ];
|
||||
};
|
||||
|
||||
libkscreen = extendDerivation super.libkscreen {
|
||||
buildInputs = [ scope.xlibs.libXrandr];
|
||||
buildInputs = [ scope.xorg.libXrandr];
|
||||
};
|
||||
|
||||
plasma-desktop = extendDerivation super.plasma-desktop {
|
||||
buildInputs = with scope;
|
||||
[ canberra ]
|
||||
++ (with xlibs; [ libxkbfile libXcursor libXft ]);
|
||||
++ (with xorg; [ libxkbfile libXcursor libXft ]);
|
||||
patches = [
|
||||
(scope.substituteAll {
|
||||
src = ./plasma-desktop/plasma-desktop-hwclock.patch;
|
||||
@ -217,13 +217,13 @@ let
|
||||
xkb = scope.xkeyboard_config;
|
||||
})
|
||||
];
|
||||
NIX_CFLAGS_COMPILE = with scope.xlibs;
|
||||
NIX_CFLAGS_COMPILE = with scope.xorg;
|
||||
lib.concatStringsSep " " [
|
||||
"-I${xf86inputsynaptics}/include/xorg"
|
||||
"-I${xf86inputevdev}/include/xorg"
|
||||
"-I${xorgserver}/include/xorg"
|
||||
];
|
||||
cmakeFlags = with scope.xlibs; [
|
||||
cmakeFlags = with scope.xorg; [
|
||||
"-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
|
||||
"-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
|
||||
];
|
||||
@ -231,7 +231,7 @@ let
|
||||
|
||||
plasma-workspace = extendDerivation super.plasma-workspace {
|
||||
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) kconfig kinit kservice qt5tools;
|
||||
@ -246,11 +246,11 @@ let
|
||||
};
|
||||
|
||||
powerdevil = extendDerivation super.powerdevil {
|
||||
buildInputs = [ scope.xlibs.libXrandr ];
|
||||
buildInputs = [ scope.xorg.libXrandr ];
|
||||
};
|
||||
|
||||
sddm-kcm = extendDerivation super.sddm-kcm {
|
||||
buildInputs = [ scope.xlibs.libXcursor ];
|
||||
buildInputs = [ scope.xorg.libXcursor ];
|
||||
};
|
||||
|
||||
};
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
, version, sha256, url ? null, ...
|
||||
} :
|
||||
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
runtimeDependencies = [
|
||||
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
|
||||
];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11 }:
|
||||
{ stdenv, fetchurl, xlibsWrapper }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ocaml-3.08.0";
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
configureScript = ./configure-3.08.0;
|
||||
dontAddPrefix = "True";
|
||||
configureFlags = ["-no-tk" "-x11lib" x11];
|
||||
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
|
||||
buildFlags = ["world" "bootstrap" "opt"];
|
||||
checkTarget = ["opt.opt"];
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11, ncurses }:
|
||||
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
@ -10,9 +10,9 @@ stdenv.mkDerivation (rec {
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk" "-x11lib" x11];
|
||||
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
|
||||
buildFlags = "world bootstrap world.opt";
|
||||
buildInputs = [x11 ncurses];
|
||||
buildInputs = [xlibsWrapper ncurses];
|
||||
installTargets = "install installopt";
|
||||
patchPhase = ''
|
||||
CAT=$(type -tp cat)
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, x11 }:
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
|
||||
|
||||
let
|
||||
useX11 = stdenv.isi686 || stdenv.isx86_64;
|
||||
@ -27,9 +27,9 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
prePatch = ''
|
||||
CAT=$(type -tp cat)
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, x11 }:
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
|
||||
|
||||
let
|
||||
useX11 = !stdenv.isArm && !stdenv.isMips;
|
||||
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
patches = optionals stdenv.isDarwin [ ./3.12.1-darwin-fix-configure.patch ];
|
||||
preConfigure = ''
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, x11 }:
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
|
||||
|
||||
let
|
||||
useX11 = !stdenv.isArm && !stdenv.isMips;
|
||||
@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
|
||||
installTargets = "install" + optionalString useNativeCompilers " installopt";
|
||||
preConfigure = ''
|
||||
CAT=$(type -tp cat)
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, x11 }:
|
||||
{ stdenv, fetchurl, ncurses, xlibsWrapper }:
|
||||
|
||||
let
|
||||
useX11 = stdenv.isi686 || stdenv.isx86_64;
|
||||
@ -26,9 +26,9 @@ stdenv.mkDerivation rec {
|
||||
patches = optionals stdenv.isDarwin [ ./gnused-on-osx-fix.patch ];
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" x11 ];
|
||||
configureFlags = ["-no-tk"] ++ optionals useX11 [ "-x11lib" xlibsWrapper ];
|
||||
buildFlags = "core coreboot all"; # "world" + optionalString useNativeCompilers " bootstrap world.opt";
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ x11 ];
|
||||
buildInputs = [ncurses] ++ optionals useX11 [ xlibsWrapper ];
|
||||
installFlags = "-i";
|
||||
installTargets = "install"; # + optionalString useNativeCompilers " installopt";
|
||||
prePatch = ''
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11, ncurses }:
|
||||
{ stdenv, fetchurl, xlibsWrapper, ncurses }:
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
|
||||
@ -10,9 +10,9 @@ stdenv.mkDerivation (rec {
|
||||
};
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
configureFlags = ["-no-tk" "-x11lib" x11];
|
||||
configureFlags = ["-no-tk" "-x11lib" xlibsWrapper];
|
||||
buildFlags = "world bootstrap world.opt";
|
||||
buildInputs = [x11 ncurses];
|
||||
buildInputs = [xlibsWrapper ncurses];
|
||||
installTargets = "install installopt";
|
||||
patchPhase = ''
|
||||
CAT=$(type -tp cat)
|
||||
|
@ -13,7 +13,7 @@
|
||||
, requireFile
|
||||
, unzip
|
||||
, file
|
||||
, xlibs ? null
|
||||
, xorg ? null
|
||||
, installjdk ? true
|
||||
, pluginSupport ? true
|
||||
, installjce ? false
|
||||
@ -34,7 +34,7 @@
|
||||
}:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
assert swingSupport -> xlibs != null;
|
||||
assert swingSupport -> xorg != null;
|
||||
|
||||
let
|
||||
|
||||
@ -173,8 +173,8 @@ let result = stdenv.mkDerivation rec {
|
||||
* libXt is only needed on amd64
|
||||
*/
|
||||
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] ++
|
||||
(if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.cc] else []);
|
||||
[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 [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";
|
||||
|
||||
|
@ -3,14 +3,14 @@
|
||||
, requireFile
|
||||
, unzip
|
||||
, makeWrapper
|
||||
, xlibs ? null
|
||||
, xorg ? null
|
||||
, installjdk ? true
|
||||
, pluginSupport ? true
|
||||
, installjce ? false
|
||||
}:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
assert swingSupport -> xlibs != null;
|
||||
assert swingSupport -> xorg != null;
|
||||
|
||||
let
|
||||
|
||||
@ -73,10 +73,10 @@ stdenv.mkDerivation {
|
||||
*/
|
||||
libraries =
|
||||
[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 (xlibs) libX11;
|
||||
inherit (xorg) libX11;
|
||||
|
||||
mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";
|
||||
|
||||
|
@ -44,7 +44,7 @@ let
|
||||
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;
|
||||
callPackage = drv: args: callPackageWithScope defaultScope drv args;
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
||||
, 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
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
buildInputs =
|
||||
[ perl gnum4 ncurses openssl
|
||||
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 '';
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
||||
, gnused, gawk, makeWrapper
|
||||
, 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;
|
||||
|
||||
with stdenv.lib;
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ perl gnum4 ncurses openssl makeWrapper
|
||||
] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]
|
||||
] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
|
||||
++ optional odbcSupport [ unixODBC ];
|
||||
|
||||
patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
||||
, gnused, gawk, makeWrapper
|
||||
, 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
|
||||
, enableHipe ? true
|
||||
}:
|
||||
|
||||
assert wxSupport -> (if stdenv.isDarwin
|
||||
then wxmac != null
|
||||
else mesa != null && wxGTK != null && xlibs != null);
|
||||
else mesa != null && wxGTK != null && xorg != null);
|
||||
|
||||
assert odbcSupport -> unixODBC != null;
|
||||
assert javacSupport -> openjdk != null;
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ 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 javacSupport [ openjdk ];
|
||||
|
||||
|
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
|
||||
, gnused, gawk, makeWrapper
|
||||
, 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
|
||||
, enableHipe ? true
|
||||
}:
|
||||
|
||||
assert wxSupport -> (if stdenv.isDarwin
|
||||
then wxmac != null
|
||||
else mesa != null && wxGTK != null && xlibs != null);
|
||||
else mesa != null && wxGTK != null && xorg != null);
|
||||
|
||||
assert odbcSupport -> unixODBC != null;
|
||||
assert javacSupport -> openjdk != null;
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ 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 javacSupport [ openjdk ];
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
|
||||
, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11
|
||||
, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11
|
||||
, makeWrapper, callPackage, self }:
|
||||
|
||||
assert zlibSupport -> zlib != null;
|
||||
@ -21,7 +21,7 @@ let
|
||||
sha256 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh";
|
||||
};
|
||||
|
||||
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]
|
||||
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ]
|
||||
++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
|
||||
++ stdenv.lib.optional zlibSupport zlib;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
|
||||
, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }:
|
||||
, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage }:
|
||||
|
||||
assert zlibSupport -> zlib != null;
|
||||
|
||||
@ -49,7 +49,7 @@ let
|
||||
|
||||
buildInputs =
|
||||
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
|
||||
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
|
||||
[ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]
|
||||
++ optional zlibSupport zlib;
|
||||
|
||||
|
||||
@ -198,7 +198,7 @@ let
|
||||
|
||||
tkinter = buildInternalPythonModule {
|
||||
moduleName = "tkinter";
|
||||
deps = [ tcl tk x11 ];
|
||||
deps = [ tcl tk xlibsWrapper ];
|
||||
};
|
||||
|
||||
readline = buildInternalPythonModule {
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
, db, gdbm, ncurses, sqlite, readline
|
||||
|
||||
, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
|
||||
, tcl ? null, tk ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? !stdenv.isCygwin
|
||||
, zlib ? null, zlibSupport ? true
|
||||
, expat, libffi
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
assert zlibSupport -> zlib != null;
|
||||
assert x11Support -> tcl != null
|
||||
&& tk != null
|
||||
&& x11 != null
|
||||
&& xlibsWrapper != null
|
||||
&& libX11 != null;
|
||||
|
||||
with stdenv.lib;
|
||||
@ -92,7 +92,7 @@ let
|
||||
++ optionals stdenv.isCygwin [ expat libffi ]
|
||||
++ optionals includeModules (
|
||||
[ db gdbm ncurses sqlite readline
|
||||
] ++ optionals x11Support [ tcl tk x11 libX11 ]
|
||||
] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
|
||||
)
|
||||
++ optional zlibSupport zlib
|
||||
|
||||
@ -249,7 +249,7 @@ let
|
||||
|
||||
tkinter = if stdenv.isCygwin then null else (buildInternalPythonModule {
|
||||
moduleName = "tkinter";
|
||||
deps = [ tcl tk x11 libX11 ];
|
||||
deps = [ tcl tk xlibsWrapper libX11 ];
|
||||
});
|
||||
|
||||
} // {
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }:
|
||||
{ fetchurl, fetchgit, stdenv, xorg, gcc44, makeWrapper, ncurses, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# 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.
|
||||
buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ];
|
||||
buildInputs = [ gcc44 ncurses xorg.libX11 xorg.libXext makeWrapper cmake ];
|
||||
|
||||
selfWrapper = ./self;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ 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
|
||||
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
|
||||
, hunspell, libevent, libstartup_notification, libvpx
|
||||
@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs =
|
||||
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
|
||||
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||
xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
|
||||
xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
|
||||
python dbus dbus_glib pango freetype fontconfig xorg.libXi
|
||||
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
|
||||
alsaLib nspr nss libnotify xorg.pixman yasm mesa
|
||||
xorg.libXScrnSaver xorg.scrnsaverproto pysqlite
|
||||
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
|
||||
hunspell libevent libstartup_notification libvpx cairo
|
||||
gstreamer gst_plugins_base icu
|
||||
];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, audiofile, libcap
|
||||
, openglSupport ? false, mesa ? null
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, x11Support ? true, x11 ? null, libXrandr ? null
|
||||
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport;
|
||||
|
||||
assert openglSupport -> (mesa != null && x11Support);
|
||||
assert x11Support -> (x11 != null && libXrandr != null);
|
||||
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
|
||||
assert alsaSupport -> alsaLib != null;
|
||||
assert pulseaudioSupport -> libpulseaudio != null;
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
|
||||
propagatedBuildInputs =
|
||||
optionals x11Support [ x11 libXrandr ] ++
|
||||
optionals x11Support [ xlibsWrapper libXrandr ] ++
|
||||
optional alsaSupport alsaLib ++
|
||||
optional stdenv.isLinux libcap ++
|
||||
optional openglSupport mesa ++
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl, pkgconfig, audiofile
|
||||
, openglSupport ? false, mesa ? null
|
||||
, alsaSupport ? true, alsaLib ? null
|
||||
, x11Support ? true, x11 ? null, libXrandr ? null
|
||||
, x11Support ? true, xlibsWrapper ? null, libXrandr ? null
|
||||
, pulseaudioSupport ? true, libpulseaudio ? null
|
||||
}:
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
|
||||
|
||||
assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support);
|
||||
assert x11Support -> (x11 != null && libXrandr != null);
|
||||
assert x11Support -> (xlibsWrapper != null && libXrandr != null);
|
||||
assert alsaSupport -> alsaLib != null;
|
||||
assert pulseaudioSupport -> libpulseaudio != null;
|
||||
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
# Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated.
|
||||
propagatedBuildInputs = stdenv.lib.optionals x11Support [ x11 libXrandr ] ++
|
||||
propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++
|
||||
stdenv.lib.optional pulseaudioSupport libpulseaudio;
|
||||
|
||||
buildInputs = [ pkgconfig audiofile ] ++
|
||||
|
@ -1,4 +1,4 @@
|
||||
{stdenv, fetchurl, x11, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
|
||||
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.5E";
|
||||
@ -8,8 +8,8 @@ stdenv.mkDerivation {
|
||||
md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
|
||||
};
|
||||
patches = [./config.patch ./laylex.patch];
|
||||
buildInputs = [x11 imake gccmakedep libXmu libXpm libXp bison flex];
|
||||
propagatedBuildInputs = [x11 libXmu];
|
||||
buildInputs = [imake gccmakedep libXpm libXp bison flex];
|
||||
propagatedBuildInputs = [xlibsWrapper libXmu];
|
||||
|
||||
meta = {
|
||||
description = "3D widget set based on the Athena Widget set";
|
||||
|
@ -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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
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 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
|
||||
, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
|
||||
, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
|
||||
, gobjectSupport ? true, glib
|
||||
, xcbSupport ? true # no longer experimental since 1.12
|
||||
, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
|
||||
|
||||
propagatedBuildInputs =
|
||||
with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ]
|
||||
with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ]
|
||||
++ optional (!stdenv.isDarwin) libXrender
|
||||
++ optionals xcbSupport [ libxcb xcbutil ]
|
||||
++ optional gobjectSupport glib
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }:
|
||||
{ fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cairomm-1.11.2";
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ pkgconfig ];
|
||||
|
||||
propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
|
||||
propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A 2D graphics library with support for multiple output devices";
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, pkgconfig, perl, zlib, libjpeg, freetype, libpng, giflib
|
||||
, enableX11 ? true, xlibs
|
||||
, enableX11 ? true, xorg
|
||||
, enableSDL ? true, SDL }:
|
||||
|
||||
let s =
|
||||
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ pkgconfig zlib libjpeg freetype giflib libpng ]
|
||||
++ stdenv.lib.optional enableSDL SDL
|
||||
++ stdenv.lib.optionals enableX11 (with xlibs; [
|
||||
++ stdenv.lib.optionals enableX11 (with xorg; [
|
||||
xproto libX11 libXext #xextproto
|
||||
#renderproto libXrender
|
||||
]);
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, x11 }:
|
||||
{ stdenv, fetchurl, cmake, xlibsWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "18.10";
|
||||
@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
buildInputs = [ cmake x11 ];
|
||||
propagatedBuildInputs = [ x11 ];
|
||||
buildInputs = [ cmake xlibsWrapper ];
|
||||
propagatedBuildInputs = [ xlibsWrapper ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A general purpose cross-platform C++ machine learning library";
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
|
||||
{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
|
||||
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng }:
|
||||
|
||||
let inherit (composableDerivation) edf; in
|
||||
@ -11,7 +11,7 @@ composableDerivation.composableDerivation {} rec {
|
||||
sha256 = "0353ngb7gpyklc9mdz8629big2na3c73akfwhis8fhqp7jkbs9ih";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
|
||||
propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
|
||||
|
||||
buildInputs = [ pkgconfig ];
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ composableDerivation, fetchurl, pkgconfig, x11, inputproto, libXi
|
||||
{ composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
|
||||
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng
|
||||
, cfg ? {}
|
||||
, automake, autoconf, libtool
|
||||
@ -21,7 +21,7 @@ composableDerivation.composableDerivation {} {
|
||||
--replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ x11 inputproto libXi freeglut ];
|
||||
propagatedBuildInputs = [ xlibsWrapper inputproto libXi freeglut ];
|
||||
|
||||
enableParallelBilding = true;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
|
||||
{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
|
||||
|
||||
let
|
||||
version = "1.7.9";
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
|
||||
};
|
||||
|
||||
buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
|
||||
buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user