diff options
| author | Domen Kožar <domen@dev.si> | 2015-10-25 17:15:35 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-10-25 20:03:09 +0100 |
| commit | 7477a7cdda2ad9bd016f1f75875c855a7a680a93 (patch) | |
| tree | 4ac187bfff03ca4b147fe64094a743d501ffcf7f | |
| parent | f7bfb4b466d76a314a3fa8044554a63dc5110fca (diff) | |
| download | nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.tar nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.tar.gz nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.tar.bz2 nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.tar.lz nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.tar.xz nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.tar.zst nixpkgs-7477a7cdda2ad9bd016f1f75875c855a7a680a93.zip | |
kde: add glib include paths to NIX_CFLAGS_COMPILE
(cherry picked from commit 350ffdcc8434f668f49e06eaf4d5cd685d42965d) Signed-off-by: Domen Kožar <domen@dev.si>
| -rw-r--r-- | pkgs/applications/kde-apps-15.04/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kde-runtime.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/plasma-nm/default.nix | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 4bae82976af..b10cca0e7bc 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -281,7 +281,7 @@ let buildInputs = [ scope.canberra ]; nativeBuildInputs = [ scope.pkgconfig ]; # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR -I${pkgs.glib}/include/glib-2.0 -I${pkgs.glib}/lib/glib-2.0/include"; # some components of this package have been replaced in other packages meta = { priority = 10; }; }; diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index e1a2f20e104..655555cd140 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -8,7 +8,7 @@ kde { buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba libcanberra libpulseaudio gpgme glib + qca2 samba libcanberra libpulseaudio gpgme networkmanager kactivities kdepimlibs openexr #todo: add openslp #todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late @@ -16,7 +16,7 @@ kde { nativeBuildInputs = [ shared_mime_info ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix index 1b94ed6fe8f..0c10e6655b8 100644 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, networkmanager, libnm-qt }: +, kdelibs, networkmanager, libnm-qt, glib }: let pname = "plasma-nm"; @@ -14,6 +14,8 @@ stdenv.mkDerivation { sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; }; + NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include"; + nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; buildInputs = [ kdelibs networkmanager libnm-qt ]; |