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/applications | |
| parent | 550b878e46e50b488282ae2ba7c4878c8e237693 (diff) | |
mass-replace glib and gtk lib/*/include paths
Diffstat (limited to 'pkgs/applications')
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3238a3ba974d4..94094a149c920 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { 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" ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index d6b9b943b6e41..696232c9f8d6f 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { glib portaudio ]; cmakeFlags = [ - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 2422d18086977..77a0d9ee0aac5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -48,10 +48,10 @@ in stdenv.mkDerivation rec { "DEFINES+=TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" "INCLUDEPATH+=${gtk2}/include/gtk-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+=${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+=${atk}/include/atk-1.0" "INCLUDEPATH+=${libappindicator-gtk2}/include/libappindicator-0.1" diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix index 3ff12c274d539..d11c317e5d6f7 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; 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" ]; |