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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:34:51 +03:00 committed by Vladimír Čunát
parent 5bb34f241e
commit d1937cf11a
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
"CONFIG+=release"
"DEFINES+=TDESKTOP_DISABLE_AUTOUPDATE"
"DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
"INCLUDEPATH+=${gtk2}/include/gtk-2.0"
"INCLUDEPATH+=${gtk2.dev}/include/gtk-2.0"
"INCLUDEPATH+=${glib.dev}/include/glib-2.0"
"INCLUDEPATH+=${glib.out}/lib/glib-2.0/include"
"INCLUDEPATH+=${cairo.dev}/include/cairo"

2
pkgs/misc/emulators/dolphin-emu/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DCMAKE_BUILD_TYPE=Release
-DENABLE_LTO=True
'';

2
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DCMAKE_BUILD_TYPE=Release
-DENABLE_LTO=True
'';

2
pkgs/misc/emulators/pcsx2/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
-DGLSL_SHADER_DIR="$out/share/pcsx2" \
-DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib.out}/lib/glib-2.0/include' \
-DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2.out}/lib/gtk-2.0/include' \
-DGTK2_INCLUDE_DIRS='${gtk2}/include/gtk-2.0' \
-DGTK2_INCLUDE_DIRS='${gtk2.dev}/include/gtk-2.0' \
-DPACKAGE_MODE=TRUE \
-DPLUGIN_DIR="$out/lib/pcsx2" \
-DREBUILD_SHADER=TRUE \

2
pkgs/tools/misc/kde-gtk-config/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
'';