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:42:34 +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
pkgs/tools/graphics/glmark2/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xlibs, libX11, mesa, libdrm, python27 }:
{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }:
stdenv.mkDerivation rec {
name = "glmark2-${version}";
version = "2014.03";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
pkgconfig libjpeg libpng12 xlibs.libxcb libX11 mesa libdrm python27
pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27
];
buildPhase = ''
pkgs/tools/graphics/glxinfo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, mesa}:
{stdenv, fetchurl, xlibsWrapper, mesa}:
let version = "8.1.0"; in
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";
};
buildInputs = [x11 mesa];
buildInputs = [xlibsWrapper mesa];
configurePhase = "true";
pkgs/tools/graphics/graphviz/2.0.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, x11, libpng, libjpeg, expat, libXaw
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
};
buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
]
++ stdenv.lib.optional (x11 == null) "--without-x";
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
meta = {
description = "A program for visualising graphs";
pkgs/tools/graphics/graphviz/2.32.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo
, yacc, libtool, fontconfig, pango, gd, xorg, gts, gettext, cairo
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd gts
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"--with-cgraph=no"
"--with-sparse=no"
]
++ stdenv.lib.optional (xlibs == null) "--without-x";
++ stdenv.lib.optional (xorg == null) "--without-x";
preBuild = ''
sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
pkgs/tools/graphics/graphviz/default.nix
+5 -5
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xlibs, gts, libdevil, gettext, cairo
, yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
, flex
}:
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender pango libXaw ]
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (xlibs != null && stdenv.system == "x86_64-darwin")
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
"-I${cairo}/include/cairo";
configureFlags =
@@ -36,14 +36,14 @@ stdenv.mkDerivation rec {
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
]
++ stdenv.lib.optional (xlibs == null) "--without-x";
++ stdenv.lib.optional (xorg == null) "--without-x";
preBuild = ''
sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
'';
# "command -v" is POSIX, "which" is not
postInstall = stdenv.lib.optionalString (xlibs != null) ''
postInstall = stdenv.lib.optionalString (xorg != null) ''
sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
sed -i 's|which|command -v|' $out/bin/vimdot
'';
pkgs/tools/graphics/scrot/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, giblib, x11 }:
{ stdenv, fetchurl, giblib, xlibsWrapper }:
stdenv.mkDerivation rec {
name = "scrot-0.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";
};
buildInputs = [ giblib x11 ];
buildInputs = [ giblib xlibsWrapper ];
meta = {
homepage = http://linuxbrit.co.uk/scrot/;