summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-03-12 02:53:02 +0300
committerNikolay Amiantov <ab@fmap.me>2016-03-12 03:10:47 +0300
commit7fb2291f55ecd5a657d6d2e9e208c05d3a794adc (patch)
tree54b66a98c521997e0204eb657dcf92db9168f469 /nixos/modules/services
parent3f6ad460e7586133bef4bf609ad96b0257271e21 (diff)
downloadnixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.tar
nixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.tar.gz
nixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.tar.bz2
nixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.tar.lz
nixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.tar.xz
nixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.tar.zst
nixlib-7fb2291f55ecd5a657d6d2e9e208c05d3a794adc.zip
enlightenment.enlightenment: 0.20.3 -> 0.20.6
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/x11/desktop-managers/enlightenment.nix6
1 files changed, 2 insertions, 4 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
       '';
     }];