colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enlightenment.{enlightenment,ephoto,rage,terminology}: use default pkgconfig

Browse Source 
With efl-1.23.1 built with meson the native pkgconfig is not needed
anymore, and building fails with it.
This commit is contained in:
José Romildo Malaquias 2019-10-26 10:22:00 -03:00
parent 51cf860553
commit ac93f9bd33
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/enlightenment/enlightenment.nix
View File

@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
(pkgconfig.override { vanilla = true; })
gettext gettext
meson meson
ninja ninja
pkgconfig
]; ];
buildInputs = [ buildInputs = [

2
pkgs/desktops/enlightenment/ephoto.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
(pkgconfig.override { vanilla = true; }) pkgconfig
mesa.dev # otherwise pkg-config does not find gbm mesa.dev # otherwise pkg-config does not find gbm
makeWrapper makeWrapper
]; ];

2
pkgs/desktops/enlightenment/rage.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
(pkgconfig.override { vanilla = true; }) pkgconfig
mesa.dev mesa.dev
wrapGAppsHook wrapGAppsHook
]; ];

2
pkgs/desktops/enlightenment/terminology.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
ninja ninja
(pkgconfig.override { vanilla = true; }) pkgconfig
makeWrapper makeWrapper
]; ];