From cba6641623e8a22e37ed3538c73fd6b45dbaed60 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 6 Oct 2015 20:31:39 +0200 Subject: cairo, pango: fix some string references --- pkgs/applications/editors/emacs-24/default.nix | 2 +- pkgs/applications/graphics/darktable/default.nix | 12 ++++++------ pkgs/applications/misc/xneur/default.nix | 14 +++++++------- pkgs/applications/science/astronomy/celestia/default.nix | 2 +- pkgs/applications/window-managers/awesome/default.nix | 2 +- pkgs/applications/window-managers/qtile/default.nix | 12 +++++------- pkgs/desktops/plasma-5.3/default.nix | 8 ++++---- pkgs/development/libraries/cogl/1.20.nix | 2 +- pkgs/development/libraries/cogl/1.22.nix | 2 +- pkgs/development/libraries/cogl/default.nix | 2 +- pkgs/development/libraries/librsvg/default.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- pkgs/tools/graphics/graphviz/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 14 files changed, 32 insertions(+), 34 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index e0d74afabcd..60078b65901 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "--with-gif=no" "--with-tiff=no" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 454dad5cf89..7d5d4cc7acb 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR" ''; @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { "-DPTHREAD_LIBRARY=${stdenv.glibc.out}/lib/libpthread.so" "-DCMAKE_BUILD_TYPE=Release" "-DBINARY_PACKAGE_BUILD=1" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk.out}/lib/gtk-2.0/include" "-DBUILD_USERMANUAL=False" ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index cc08436fa03..8e3165b75d2 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango}/include/pango-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/include/gdk-pixbuf-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/lib/gdk-pixbuf-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include" export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify" ''; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index d4da5c113c9..0213348a593 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { CPPFLAGS="-DNDEBUG" CFLAGS="-O2 -fsigned-char" CXXFLAGS="-O2 -fsigned-char" - GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" + GTK_CFLAGS="-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include" GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0" ) ''; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 5fd72a4b4d7..0e05afa0d60 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; - GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; + GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 236baa131c9..3a26666a529 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: +{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: buildPythonPackage rec { name = "qtile-${version}"; @@ -20,20 +20,18 @@ buildPythonPackage rec { buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; cairocffi-xcffib = python27Packages.cairocffi.override { - LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; + inherit LD_LIBRARY_PATH; pythonPath = [ python27Packages.xcffib ]; }; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ]; - LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${lib.makeLibraryPath [ pkgs.xorg.libxcb pkgs.cairo ]}"; postInstall = '' wrapProgram $out/bin/qtile \ - --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \ - --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib + --prefix LD_LIBRARY_PATH : \ + "${LD_LIBRARY_PATH}:${lib.makeLibraryPath [ pkgs.glib pkgs.pango ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix index ad5316a9cb2..35c32829921 100644 --- a/pkgs/desktops/plasma-5.3/default.nix +++ b/pkgs/desktops/plasma-5.3/default.nix @@ -180,12 +180,12 @@ let kde-gtk-config = extendDerivation super.kde-gtk-config { NIX_CFLAGS_COMPILE = with scope; lib.concatStringsSep " " [ - "-I${cairo}/include/cairo" - "-I${gtk2}/include/gtk-2.0" + "-I${cairo.dev}/include/cairo" + "-I${gtk2.dev}/include/gtk-2.0" "-I${gtk2.out}/lib/gtk-2.0/include" - "-I${glib}/include/glib-2.0" + "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" - "-I${pango}/include/pango-1.0" + "-I${pango.dev}/include/pango-1.0" ]; }; diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix index 5eb12fe2998..ae202b09377 100644 --- a/pkgs/development/libraries/cogl/1.20.nix +++ b/pkgs/development/libraries/cogl/1.20.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { COGL_PANGO_DEP_CFLAGS = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix index ce4fda5bd46..88bb6707749 100644 --- a/pkgs/development/libraries/cogl/1.22.nix +++ b/pkgs/development/libraries/cogl/1.22.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { COGL_PANGO_DEP_CFLAGS = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index a4a20fce023..e4570209066 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { COGL_PANGO_DEP_CFLAGS = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo"; + "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 927ee472ec3..0768a21bf54 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; NIX_CFLAGS_COMPILE - = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo}/include/cairo"; + = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 2743bd78aa7..6eb8b5bceb2 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ] ++ 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"; + CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; configureFlags = [ "--with-pngincludedir=${libpng}/include" diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index fbf1c114d0a..993e6314fb8 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") - "-I${cairo}/include/cairo"; + "-I${cairo.dev}/include/cairo"; configureFlags = [ "--with-pngincludedir=${libpng}/include" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 088cd63f089..f3e81603938 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17156,7 +17156,7 @@ let mock ]; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; meta = { description = "Graphite-web, without the interface. Just the rendering HTTP API"; -- cgit 1.4.1