about summary refs log tree commit diff
path: root/pkgs/development/tools/electron
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-09-15 11:26:18 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-09-15 12:54:34 +0200
commit88c9f8b574ead01e32c5ee5228679723343cd52c (patch)
tree92196d2055a7842ae40c022581220bace87ab9e1 /pkgs/development/tools/electron
parent21e3ff658ac2d7b7986169f31550aa5f65bb7635 (diff)
downloadnixlib-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/electron')
-rw-r--r--pkgs/development/tools/electron/default.nix8
1 files changed, 4 insertions, 4 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 {