diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:26:18 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:54:34 +0200 |
commit | 88c9f8b574ead01e32c5ee5228679723343cd52c (patch) | |
tree | 92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/development/tools | |
parent | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff) | |
download | nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.gz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.bz2 nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.lz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.xz nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.tar.zst nixlib-88c9f8b574ead01e32c5ee5228679723343cd52c.zip |
xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc. - Avoided renaming local (and different) xlibs binding in gcc*. - Fixed cases where both xorg and xlibs were used. Hopefully everything still works as before.
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/electron/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/node-webkit/nw11.nix | 10 | ||||
-rw-r--r-- | pkgs/development/tools/node-webkit/nw12.nix | 10 | ||||
-rw-r--r-- | pkgs/development/tools/node-webkit/nw9.nix | 10 | ||||
-rw-r--r-- | pkgs/development/tools/selenium/server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/thrust/default.nix | 8 |
6 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b3867be6377c..d686da98fa38 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -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, unzip +, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip , 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 { diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 978213f67601..ed3b99aad009 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 0ad3ece24651..7492acb13678 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap , libnotify}: let @@ -9,10 +9,10 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc - xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc + xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; }; diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index 97399e5268ce..213b94102b0d 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,10 +8,10 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf - freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage - xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc.cc - xlibs.libXtst xlibs.libXi + xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage + xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc + xorg.libXtst xorg.libXi ]; }; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 26435088aded..2efd85f84010 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xlibs +{ stdenv, fetchurl, makeWrapper, jre, jdk, gcc, xorg , chromedriver, chromeSupport ? true }: with stdenv.lib; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a5bfb8bfc59f..a59d656b625a 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss -, xlibs, libcap, unzip +, xorg, libcap, unzip }: let @@ -8,9 +8,9 @@ let name = "env-thrust"; paths = [ stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf - cairo cups expat 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 + cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 + xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite + xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap ]; }; in stdenv.mkDerivation rec { |