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

4
pkgs/misc/emulators/snes9x-gtk/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, x11, libpulseaudio}:
{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}:
stdenv.mkDerivation rec {
name = "snes9x-gtk-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3";
};
buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 x11 libpulseaudio];
buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio];
sourceRoot = "snes9x-${version}-src/gtk";

4
pkgs/misc/emulators/wine/base.nix
View File

@@ -19,8 +19,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
]) ++ (with pkgs.xlibs; [
xlibs libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
]) ++ (with pkgs.xorg; [
xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
]));
# Wine locates a lot of libraries dynamically through dlopen(). Add

6
pkgs/misc/ghostscript/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, expat, openssl
, libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
, libiconv
, x11Support ? false, x11 ? null
, x11Support ? false, xlibsWrapper ? null
, cupsSupport ? false, cups ? null
}:
assert x11Support -> x11 != null;
assert x11Support -> xlibsWrapper != null;
assert cupsSupport -> cups != null;
let
version = "9.15";
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
libiconv
]
++ stdenv.lib.optional x11Support x11
++ stdenv.lib.optional x11Support xlibsWrapper
++ stdenv.lib.optional cupsSupport cups
# [] # maybe sometimes jpeg2000 support
;

4
pkgs/misc/screensavers/electricsheep/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xlibs}:
{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}:
stdenv.mkDerivation rec {
name = "electricsheep-2.6.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5";
};
buildInputs = [pkgconfig expat zlib libpng libjpeg xlibs.xlibs xlibs.libXv];
buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv];
preInstall = ''
installFlags=GNOME_DATADIR=$out

4
pkgs/misc/screensavers/rss-glx/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, x11, libXext, mesa, imagemagick, libtiff, bzip2}:
{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}:
stdenv.mkDerivation rec {
version = "0.9.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg";
};
buildInputs = [ pkgconfig mesa x11 imagemagick libtiff bzip2 ];
buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ];
NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick";
NIX_LDFLAGS= "-rpath ${libXext}/lib";

4
pkgs/misc/screensavers/xautolock/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, imake, libXScrnSaver, scrnsaverproto}:
{stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto}:
stdenv.mkDerivation rec
{
@@ -11,5 +11,5 @@ stdenv.mkDerivation rec
makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man";
preBuild = "xmkmf";
installTargets = "install install.man";
buildInputs = [x11 imake libXScrnSaver scrnsaverproto];
buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto];
}

4
pkgs/misc/screensavers/xtrlock-pam/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, python, pkgconfig, x11, pam }:
{ stdenv, fetchgit, python, pkgconfig, xlibsWrapper, pam }:
stdenv.mkDerivation {
name = "xtrlock-pam-3.4-post-20150909";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "fa8aeedfa2a4e1d813f8cad562bafdd4e2c5130df0a7cde7b2f956a32044e9f8";
};
buildInputs = [ python pkgconfig x11 pam ];
buildInputs = [ python pkgconfig xlibsWrapper pam ];
configurePhase = ''
substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h

4
pkgs/misc/themes/qtcurve/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl, cmake, gettext, pkgconfig # Build tools
, gtk2, kde_workspace, kdelibs # Toolkit dependencies
, libpthreadstubs, libXdmcp, libxcb, xlibs # X11 dependencies
, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies
}:
stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
libXdmcp
libxcb
pkgconfig
xlibs.libxshmfence
xorg.libxshmfence
];
patches = [