From dc1f06bc47a74f2755a5d6e0a854462d9c08bfb3 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 5 Dec 2015 18:13:36 +0200 Subject: Use "out", not "dev" for dlopen'able libraries --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5fa5974cbf3..443a4ab5cf97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2565,7 +2565,7 @@ in modules // { patchPhase = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py + sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py ''; meta = { @@ -23731,7 +23731,7 @@ in modules // { patchPhase = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py + sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; propagatedBuildInputs = [ self.cffi self.six ]; -- cgit 1.4.1 From f07a7fc5fde030ac4262324fde94983da385fb80 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 5 Dec 2015 18:14:35 +0200 Subject: qtile: dlopen'able path now are in "out", not "dev" --- pkgs/applications/window-managers/qtile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') 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 ]; -- cgit 1.4.1 From c53e932e5b77cea445cb4716768394ca5e04d4b7 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 5 Dec 2015 18:15:20 +0200 Subject: fvwm: Missing libXt build input --- pkgs/applications/window-managers/fvwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') 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; -- cgit 1.4.1 From 61020943d1f8fcbffc39a5a9ee3b2357b1784e59 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 27 Jan 2016 15:33:50 +0200 Subject: syslog-ng: add explicit pcre build dependency --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') 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" -- cgit 1.4.1