diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-10-26 10:22:00 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2019-10-26 10:47:11 -0300 |
| commit | ac93f9bd33656911cc6355be01bc2a04588edf08 (patch) | |
| tree | 3e56c0bd239958b4ee06e47dee3268c317f993ca /pkgs/desktops/enlightenment | |
| parent | 51cf8605534bfe2b74d32536d4f6918e2826e5aa (diff) | |
| download | nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.tar nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.tar.gz nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.tar.bz2 nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.tar.lz nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.tar.xz nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.tar.zst nixpkgs-ac93f9bd33656911cc6355be01bc2a04588edf08.zip | |
enlightenment.{enlightenment,ephoto,rage,terminology}: use default pkgconfig
With efl-1.23.1 built with meson the native pkgconfig is not needed anymore, and building fails with it.
Diffstat (limited to 'pkgs/desktops/enlightenment')
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/ephoto.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/rage.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/terminology.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 99d1236ea88..0fb249135a2 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - (pkgconfig.override { vanilla = true; }) gettext meson ninja + pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index f1455f68338..3563b9aabc1 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - (pkgconfig.override { vanilla = true; }) + pkgconfig mesa.dev # otherwise pkg-config does not find gbm makeWrapper ]; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 8d99ce6e8e0..f0a9799e5b4 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - (pkgconfig.override { vanilla = true; }) + pkgconfig mesa.dev wrapGAppsHook ]; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index 52f0ff15e23..5c2a4169822 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - (pkgconfig.override { vanilla = true; }) + pkgconfig makeWrapper ]; |