diff options
| author | romildo <malaquias@gmail.com> | 2017-08-22 15:54:56 -0300 |
|---|---|---|
| committer | romildo <malaquias@gmail.com> | 2017-08-22 15:54:56 -0300 |
| commit | 7ffee4de3c2cb2af9d4e48c44de6247174cabac2 (patch) | |
| tree | 9ea62ea39c00e7cdd617b7201759527b9048785c /pkgs/desktops/enlightenment/enlightenment.nix | |
| parent | d1cbd546e00cf77a4248b4d5da54368cfd189f0c (diff) | |
| download | nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.tar nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.tar.gz nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.tar.bz2 nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.tar.lz nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.tar.xz nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.tar.zst nixpkgs-7ffee4de3c2cb2af9d4e48c44de6247174cabac2.zip | |
efl: use vanilla pkg-config
Use vanilla pkg-config to build EFL applications. The EFL library has a set of pkg-config files (*.pc) which uses private requirements. The default pkg-config setup on nixpkgs is patched to disable resolving those requirements. See http://bugs.freedesktop.org/show_bug.cgi?id=4738 for reference. As a consequence each package depending on efl has to explicitly set the search path in order to be able to find the corresponding header files. By using vanilla pkg-config this is not necessary (and this is the expected behaviour for pkg-config), allowing simpler nix expressions.
Diffstat (limited to 'pkgs/desktops/enlightenment/enlightenment.nix')
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 7976176af1b..b16b84acf14 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, -mesa_glu, xkeyboard_config }: +mesa_glu, xkeyboard_config, pcre }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; @@ -11,22 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0w5f3707hyfc20i6xqh4jlr5p2yhy1z794061mjsz2rp4w00qmpb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) ]; buildInputs = [ efl libXdmcp libxcb xcbutilkeysyms libXrandr libffi pam alsaLib - luajit bzip2 libpthreadstubs gdbm + luajit bzip2 libpthreadstubs gdbm pcre ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ - "-I${efl}/include/ecore-imf-1" - "-I${efl}/include/emile-1" - "-I${efl}/include/eo-1" - "-I${efl}/include/ethumb-1" - "-I${efl}/include/ethumb-client-1" - ]; - preConfigure = '' export USER_SESSION_DIR=$prefix/lib/systemd/user |