diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-14 04:11:58 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-14 04:13:54 +0300 |
| commit | 755e4633c7e6778f9883f005930a5af471945151 (patch) | |
| tree | 80aa5705fa540fcf5823077c91c7afe5408a67ca /pkgs/misc | |
| parent | 550b878e46e50b488282ae2ba7c4878c8e237693 (diff) | |
| download | nixpkgs-755e4633c7e6778f9883f005930a5af471945151.tar nixpkgs-755e4633c7e6778f9883f005930a5af471945151.tar.gz nixpkgs-755e4633c7e6778f9883f005930a5af471945151.tar.bz2 nixpkgs-755e4633c7e6778f9883f005930a5af471945151.tar.lz nixpkgs-755e4633c7e6778f9883f005930a5af471945151.tar.xz nixpkgs-755e4633c7e6778f9883f005930a5af471945151.tar.zst nixpkgs-755e4633c7e6778f9883f005930a5af471945151.zip | |
mass-replace glib and gtk lib/*/include paths
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 4 | ||||
| -rw-r--r-- | pkgs/misc/emulators/pcsx2/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index ea32287da74..f264b311dad 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { }; 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 -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 06734d24c8a..2a9d923f3e8 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { }; 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 -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 63b221c9a3d..109c182d573 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { -DDOC_DIR="$out/share/doc/pcsx2" \ -DGAMEINDEX_DIR="$out/share/pcsx2" \ -DGLSL_SHADER_DIR="$out/share/pcsx2" \ - -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' \ -DPACKAGE_MODE=TRUE \ -DPLUGIN_DIR="$out/lib/pcsx2" \ |