mass-replace glib and gtk lib/*/include paths
This commit is contained in:
parent
550b878e46
commit
755e4633c7
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
|
sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
|
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
|
||||||
|
|
||||||
configureFlags = [ "--disable-gsettings-convert-install" ];
|
configureFlags = [ "--disable-gsettings-convert-install" ];
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
||||||
glib portaudio ];
|
glib portaudio ];
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
|
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||||
];
|
];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
|
@ -48,10 +48,10 @@ in stdenv.mkDerivation rec {
|
||||||
"DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
|
"DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME"
|
||||||
"INCLUDEPATH+=${gtk2}/include/gtk-2.0"
|
"INCLUDEPATH+=${gtk2}/include/gtk-2.0"
|
||||||
"INCLUDEPATH+=${glib}/include/glib-2.0"
|
"INCLUDEPATH+=${glib}/include/glib-2.0"
|
||||||
"INCLUDEPATH+=${glib}/lib/glib-2.0/include"
|
"INCLUDEPATH+=${glib.out}/lib/glib-2.0/include"
|
||||||
"INCLUDEPATH+=${cairo}/include/cairo"
|
"INCLUDEPATH+=${cairo}/include/cairo"
|
||||||
"INCLUDEPATH+=${pango}/include/pango-1.0"
|
"INCLUDEPATH+=${pango}/include/pango-1.0"
|
||||||
"INCLUDEPATH+=${gtk2}/lib/gtk-2.0/include"
|
"INCLUDEPATH+=${gtk2.out}/lib/gtk-2.0/include"
|
||||||
"INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0"
|
"INCLUDEPATH+=${gdk_pixbuf}/include/gdk-pixbuf-2.0"
|
||||||
"INCLUDEPATH+=${atk}/include/atk-1.0"
|
"INCLUDEPATH+=${atk}/include/atk-1.0"
|
||||||
"INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1"
|
"INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1"
|
||||||
|
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
|
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,8 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
|
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
|
@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DWITH_SYSTEM_FFMPEG=1"
|
"-DWITH_SYSTEM_FFMPEG=1"
|
||||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
|
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = ''
|
cmakeFlags = ''
|
||||||
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
|
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
|
||||||
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-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}/include/gtk-2.0
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=Release
|
||||||
-DENABLE_LTO=True
|
-DENABLE_LTO=True
|
||||||
|
|
|
@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = ''
|
cmakeFlags = ''
|
||||||
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
|
-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
|
||||||
-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-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}/include/gtk-2.0
|
||||||
-DCMAKE_BUILD_TYPE=Release
|
-DCMAKE_BUILD_TYPE=Release
|
||||||
-DENABLE_LTO=True
|
-DENABLE_LTO=True
|
||||||
|
|
|
@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
|
||||||
-DDOC_DIR="$out/share/doc/pcsx2" \
|
-DDOC_DIR="$out/share/doc/pcsx2" \
|
||||||
-DGAMEINDEX_DIR="$out/share/pcsx2" \
|
-DGAMEINDEX_DIR="$out/share/pcsx2" \
|
||||||
-DGLSL_SHADER_DIR="$out/share/pcsx2" \
|
-DGLSL_SHADER_DIR="$out/share/pcsx2" \
|
||||||
-DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib}/lib/glib-2.0/include' \
|
-DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib.out}/lib/glib-2.0/include' \
|
||||||
-DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2}/lib/gtk-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}/include/gtk-2.0' \
|
||||||
-DPACKAGE_MODE=TRUE \
|
-DPACKAGE_MODE=TRUE \
|
||||||
-DPLUGIN_DIR="$out/lib/pcsx2" \
|
-DPLUGIN_DIR="$out/lib/pcsx2" \
|
||||||
|
|
Loading…
Reference in a new issue