diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 10:38:44 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 10:42:34 +0200 |
commit | 76ef7a93e302a4a92954e4b40863c6702df5ac8d (patch) | |
tree | 421a74c886dadc0001b7f42a78ad2cf8b1a5de6f /pkgs/applications/networking | |
parent | 6b0add86b99f7d03f6bc80c1742f79e80b9ae413 (diff) | |
parent | eb09b1fd856e7346d60188b2df64fdfe758c2fc4 (diff) | |
download | nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.gz nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.bz2 nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.lz nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.xz nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.zst nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.zip |
Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
Diffstat (limited to 'pkgs/applications/networking')
10 files changed, 43 insertions, 43 deletions
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 0e4fd4db1ba8..1a698b0effda 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -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; diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ea9d03f321e0..ce5eac7a2ff8 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -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 diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 05e3a8bf613a..ba40925e1d1e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -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 = diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index ade28b519bc5..d8c421af46a8 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -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"; diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 37c0b4a694dd..770f0952e1fc 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -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 diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index c6551307df9d..6dc0df03eef8 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -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 diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 13798061b71b..ece4b9f0e013 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -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 { diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index d0cc333c71b6..f9209f28cf20 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -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/"; diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 4ebfddf82e19..8e07bbf975b2 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 5d6e0faad4a8..96dd7bb9af04 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -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 ]; |