diff options
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/enlightenment.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 22 |
2 files changed, 13 insertions, 15 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 994960b1d37f..c981b40f74a6 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -7,7 +7,6 @@ let e = pkgs.enlightenment; xcfg = config.services.xserver; cfg = xcfg.desktopManager.enlightenment; - enlightenment = e.enlightenment.override { set_freqset_setuid = true; }; GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ pkgs.gst_all_1.gst-plugins-base pkgs.gst_all_1.gst-plugins-good @@ -30,7 +29,7 @@ in config = mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = [ - e.efl e.evas e.emotion e.elementary enlightenment + e.efl e.evas e.emotion e.elementary e.enlightenment e.terminology e.econnman pkgs.xorg.xauth # used by kdesu pkgs.gtk # To get GTK+'s themes. @@ -59,8 +58,7 @@ in # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${enlightenment}/bin/enlightenment_start - waitPID=$! + exec ${e.enlightenment}/bin/enlightenment_start ''; }]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index ee9b3fbc526c..ea232a2c6070 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid -, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: +{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, +libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu +, xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.20.3"; + version = "0.20.6"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j"; + sha256 = "11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj"; }; - buildInputs = [ pkgconfig efl elementary xorg.libXdmcp xorg.libxcb - xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid + buildInputs = [ pkgconfig efl elementary libXdmcp libxcb + xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; preConfigure = '' @@ -24,19 +25,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # this is a hack and without this cpufreq module is not working: - # when set_freqset_setuid is true and "e_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module), - # then this postInstall does the folowing: + # this is a hack and without this cpufreq module is not working. does the following: # 1. moves the "freqset" binary to "e_freqset", # 2. linkes "e_freqset" to enlightenment/bin so that, # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset, # 4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it - postInstall = if set_freqset_setuid then '' + postInstall = '' export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset - '' else ""; + ''; + meta = { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; |