public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge: xlibs and x11 attribute cleanup

Browse Source 
Frequently using multiple *almost* identical attributes is bad.
This commit is contained in:
Vladimír Čunát
2015-09-23 10:38:44 +02:00
parent 6b0add86b9 eb09b1fd85
commit 76ef7a93e3
192 changed files with 566 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/electron/default.nix
View File

@@ -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 {

10
pkgs/development/tools/node-webkit/nw11.nix
View File

@@ -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
];
};

10
pkgs/development/tools/node-webkit/nw12.nix
View File

@@ -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
];
};

10
pkgs/development/tools/node-webkit/nw9.nix
View File

@@ -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
];
};

4
pkgs/development/tools/selenium/server/default.nix
View File

@@ -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}
'';

8
pkgs/development/tools/thrust/default.nix
View File

@@ -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 {