diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-28 13:03:00 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-28 13:05:30 +0100 |
| commit | 2cc537bd0636a922e533db743ae9c3c48697bb3b (patch) | |
| tree | 52d9a73b552b2b23e93f820ccb9bc397e77347e9 /pkgs | |
| parent | 66365b76dd75e90f22b5347614778abf36c7fd84 (diff) | |
| parent | 61020943d1f8fcbffc39a5a9ee3b2357b1784e59 (diff) | |
| download | nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.tar nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.tar.gz nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.tar.bz2 nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.tar.lz nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.tar.xz nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.tar.zst nixlib-2cc537bd0636a922e533db743ae9c3c48697bb3b.zip | |
Merge #11597: various multiple-output fixes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/fvwm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/qtile/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/system/syslog-ng/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index aded77a466da..77263293847c 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -1,7 +1,7 @@ { gestures ? false , stdenv, fetchurl, pkgconfig , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama -, libXpm, librsvg, libpng, fribidi, perl +, libXpm, libXt, librsvg, libpng, fribidi, perl , libstroke ? null }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cairo fontconfig freetype - libXft libXcursor libXinerama libXpm + libXft libXcursor libXinerama libXpm libXt librsvg libpng fribidi perl ] ++ stdenv.lib.optional gestures libstroke; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 19434da71176..8af46f52354a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -24,9 +24,9 @@ buildPythonPackage rec { postPatch = '' 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 pango ${pkgs.pango} - substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor} + substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out} + substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out} + 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 ]; diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 4fcc0680ada6..d98f05c6aabb 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl -, riemann_c_client, protobufc, yacc }: +, riemann_c_client, protobufc, pcre, yacc }: stdenv.mkDerivation rec { name = "syslog-ng-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { 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 = [ "--enable-dynamic-linking" |