summary refs log tree commit diff
path: root/pkgs/desktops/enlightenment
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/enlightenment')
-rw-r--r--pkgs/desktops/enlightenment/efl.nix4
-rw-r--r--pkgs/desktops/enlightenment/enlightenment.nix6
-rw-r--r--pkgs/desktops/enlightenment/ephoto.nix6
-rw-r--r--pkgs/desktops/enlightenment/rage.nix6
-rw-r--r--pkgs/desktops/enlightenment/terminology.nix4
5 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 5545142fdc3..96395b6df2f 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -3,7 +3,7 @@
 , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, bullet, luajit
 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
 , dbus, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
-, curl, libinput, systemd, mesa_noglu, writeText, gtk3
+, curl, libinput, systemd, mesa, writeText, gtk3
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gtk3 ];
 
-  buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu
+  buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa
     giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.xorgproto
     xorg.libX11 udev systemd ];
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 8edf702a24c..07aac3d611b 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
   xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu,
+  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
   xkeyboard_config, pcre
 }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     libpthreadstubs
     gdbm
     pcre
-    mesa_noglu
+    mesa
     xkeyboard_config
   ] ++
     stdenv.lib.optionals stdenv.isLinux [ libcap ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     # installer to try to do this, the file $out/e-wrappers.nix is created,
     # containing the needed configuration for wrapping those programs. It
     # can be used in the enlightenment module. The idea is:
-    # 
+    #
     #  1) rename the original binary adding the extension .orig
     #  2) wrap the renamed binary at /run/wrappers/bin/
     #  3) create a new symbolic link using the original binary name (in the
diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix
index ad4620d4f45..409b3f7bb8d 100644
--- a/pkgs/desktops/enlightenment/ephoto.nix
+++ b/pkgs/desktops/enlightenment/ephoto.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "ephoto-${version}";
   version = "1.5";
-  
+
   src = fetchurl {
     url = "http://www.smhouston.us/stuff/${name}.tar.gz";
     sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     (pkgconfig.override { vanilla = true; })
-    mesa_noglu.dev # otherwise pkg-config does not find gbm
+    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 e7dfb5ca398..9c397445224 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rage-${version}";
   version = "0.3.0";
-  
+
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.xz";
     sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     (pkgconfig.override { vanilla = true; })
-    mesa_noglu.dev
+    mesa.dev
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index a2cd8ee192d..92d36c0e772 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "terminology";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     efl
     pcre
-    mesa_noglu
+    mesa
   ];
 
   meta = {