dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge #11597: various multiple-output fixes

Browse Source
This commit is contained in:
Vladimír Čunát 2016-01-28 13:03:00 +01:00
commit 2cc537bd06
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/fvwm/default.nix
View File

@ -1,7 +1,7 @@
{ gestures ? false { gestures ? false
, stdenv, fetchurl, pkgconfig , stdenv, fetchurl, pkgconfig
, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
, libXpm, librsvg, libpng, fribidi, perl , libXpm, libXt, librsvg, libpng, fribidi, perl
, libstroke ? null , libstroke ? null
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pkgconfig cairo fontconfig freetype pkgconfig cairo fontconfig freetype
libXft libXcursor libXinerama libXpm libXft libXcursor libXinerama libXpm libXt
librsvg libpng fribidi perl librsvg libpng fribidi perl
] ++ stdenv.lib.optional gestures libstroke; ] ++ stdenv.lib.optional gestures libstroke;

6
pkgs/applications/window-managers/qtile/default.nix
View File

@ -24,9 +24,9 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace libqtile/manager.py --subst-var-by out $out substituteInPlace libqtile/manager.py --subst-var-by out $out
substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib} substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out}
substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango} substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out}
substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor} substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out}
''; '';
buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];

4
pkgs/tools/system/syslog-ng/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
, riemann_c_client, protobufc, yacc }: , riemann_c_client, protobufc, pcre, yacc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "syslog-ng-${version}"; name = "syslog-ng-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg"; sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
}; };
buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ]; buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
configureFlags = [ configureFlags = [
"--enable-dynamic-linking" "--enable-dynamic-linking"