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/instant-messengers | |
parent | 6b0add86b99f7d03f6bc80c1742f79e80b9ae413 (diff) | |
parent | eb09b1fd856e7346d60188b2df64fdfe758c2fc4 (diff) | |
download | nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.gz nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.bz2 nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.lz nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.xz nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.zst nixpkgs-76ef7a93e302a4a92954e4b40863c6702df5ac8d.zip |
Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
5 files changed, 24 insertions, 24 deletions
diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 37c0b4a694d..770f0952e1f 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 c6551307df9..6dc0df03eef 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 13798061b71..ece4b9f0e01 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 d0cc333c71b..f9209f28cf2 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 4ebfddf82e1..8e07bbf975b 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 = '' |