alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

kde-gtk-config-*: fix with multiple outputs

Browse source
This commit is contained in:
Vladimír Čunát 2015-10-04 14:54:57 +02:00
parent 551cce01ff
commit a0581b1e74
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/plasma-5.3/default.nix
View file

@ -182,9 +182,9 @@ let
lib.concatStringsSep " " [
"-I${cairo}/include/cairo"
"-I${gtk2}/include/gtk-2.0"
"-I${gtk2}/lib/gtk-2.0/include"
"-I${gtk2.out}/lib/gtk-2.0/include"
"-I${glib}/include/glib-2.0"
"-I${glib}/lib/glib-2.0/include"
"-I${glib.out}/lib/glib-2.0/include"
"-I${pango}/include/pango-1.0"
];
};

4
pkgs/desktops/plasma-5.4/kde-gtk-config.nix
View file

@ -20,7 +20,7 @@ plasmaPackage {
kio knewstuff
];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
];
}

4
pkgs/tools/misc/kde-gtk-config/default.nix
View file

@ -22,8 +22,8 @@ stdenv.mkDerivation {
];
cmakeFlags = ''
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
-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
-DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
'';