diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:46:29 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:28 +0200 |
| commit | 5e5c5382f608a729343dc624488383a7d6b233a7 (patch) | |
| tree | e7deac4bb6f8665c1aae5e4615006d858f5230b7 /pkgs | |
| parent | c22f86a853a5045b9d4b6cd79425d968de24b999 (diff) | |
| download | nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.tar nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.tar.gz nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.tar.bz2 nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.tar.lz nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.tar.xz nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.tar.zst nixpkgs-5e5c5382f608a729343dc624488383a7d6b233a7.zip | |
treewide: Make explicit that 'dev' output of cairo is used
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs-25/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index f798843639c..e2d5e78c94a 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -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 diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c88c9a77bf1..721dbcac6fb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -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" |