nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

kde: add glib include paths to NIX_CFLAGS_COMPILE

Browse Source 
(cherry picked from commit 350ffdcc84)
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Domen Kožar 2015-10-25 17:15:35 +01:00
parent f7bfb4b466
commit 7477a7cdda
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -281,7 +281,7 @@ let
buildInputs = [ scope.canberra ]; buildInputs = [ scope.canberra ];
nativeBuildInputs = [ scope.pkgconfig ]; nativeBuildInputs = [ scope.pkgconfig ];
# cmake does not detect path to `ilmbase` # 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 # some components of this package have been replaced in other packages
meta = { priority = 10; }; meta = { priority = 10; };
}; };

4
pkgs/desktops/kde-4.14/kde-runtime.nix
View File

@ -8,7 +8,7 @@ kde {
buildInputs = [ buildInputs = [
kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
qca2 samba libcanberra libpulseaudio gpgme glib qca2 samba libcanberra libpulseaudio gpgme
networkmanager kactivities kdepimlibs openexr networkmanager kactivities kdepimlibs openexr
#todo: add openslp #todo: add openslp
#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late #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 ]; 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 ]; passthru.propagatedUserEnvPackages = [ virtuoso ];

4
pkgs/tools/networking/plasma-nm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
, kdelibs, networkmanager, libnm-qt }: , kdelibs, networkmanager, libnm-qt, glib }:
let let
pname = "plasma-nm"; pname = "plasma-nm";
@ -14,6 +14,8 @@ stdenv.mkDerivation {
sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751";
}; };
NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
buildInputs = [ kdelibs networkmanager libnm-qt ]; buildInputs = [ kdelibs networkmanager libnm-qt ];