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

treewide: Make explicit that 'dev' output of cairo is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:46:29 +03:00 committed by Vladimír Čunát
parent c22f86a853
commit 5e5c5382f6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/emacs-25/default.nix
View File

@ -62,7 +62,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";
preBuild = ''
find . -name '*.elc' -delete

2
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
"INCLUDEPATH+=${gtk2}/include/gtk-2.0"
"INCLUDEPATH+=${glib}/include/glib-2.0"
"INCLUDEPATH+=${glib.out}/lib/glib-2.0/include"
"INCLUDEPATH+=${cairo}/include/cairo"
"INCLUDEPATH+=${cairo.dev}/include/cairo"
"INCLUDEPATH+=${pango}/include/pango-1.0"
"INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include"
"INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0"