summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-03-12 02:52:32 +0300
committerNikolay Amiantov <ab@fmap.me>2016-03-12 03:10:46 +0300
commit3f6ad460e7586133bef4bf609ad96b0257271e21 (patch)
treefc4a63f209ee385b15bbfc4f4d0f30cb83debfa9
parente358d9498c493a3e53769e0514afed8836ae0b3e (diff)
downloadnixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.tar
nixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.tar.gz
nixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.tar.bz2
nixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.tar.lz
nixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.tar.xz
nixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.tar.zst
nixpkgs-3f6ad460e7586133bef4bf609ad96b0257271e21.zip
enlightenment.efl: 1.16.1 -> 1.17.0
-rw-r--r--nixos/modules/services/x11/desktop-managers/enlightenment.nix2
-rw-r--r--pkgs/desktops/enlightenment/efl.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 6c77a725679..994960b1d37 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -76,7 +76,7 @@ in
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
-    #services.dbus.packages = [ pkgs.efl ]; # dbus-1 folder is not in /etc but in /share, so needs fixing first
+    services.dbus.packages = [ e.efl ];
 
     systemd.user.services.efreet =
       { enable = true;
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index dd9c837ed8b..c2124f0b292 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.16.1";
+  version = "1.17.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
+    sha256 = "1zisnz4x54mn9sm46kcr571faqnazkcglyf0lbz19l34syx40df1";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa