diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:42:06 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:25 +0200 |
commit | 85a51074dc5cde05fc8359c54e7f425953ef7880 (patch) | |
tree | 3b822e74e04186cabad7ed0193a330eb48ad059f | |
parent | d298b52fd35a2416128bc333dee52c0c79986226 (diff) | |
download | nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.tar nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.tar.gz nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.tar.bz2 nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.tar.lz nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.tar.xz nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.tar.zst nixpkgs-85a51074dc5cde05fc8359c54e7f425953ef7880.zip |
treewide: Make explicit that 'dev' output of atk is used
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/astronomy/celestia/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 37c0fd6a175..c88c9a77bf1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { "INCLUDEPATH+=${pango}/include/pango-1.0" "INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include" "INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0" - "INCLUDEPATH+=${atk}/include/atk-1.0" + "INCLUDEPATH+=${atk.dev}/include/atk-1.0" "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1" "INCLUDEPATH+=${libunity}/include/unity" "INCLUDEPATH+=${dee}/include/dee-1.0" diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 971c19e9c3d..d28aa8e62a1 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { CPPFLAGS = "-DNDEBUG"; CFLAGS = "-O2 -fsigned-char"; CXXFLAGS = "-O2 -fsigned-char"; - 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}/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"; installPhase = ''make MKDIR_P="mkdir -p" install''; |