From 91a23ebcc6624ff603933f2b8fccde19bfe3df04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 May 2016 09:54:23 -0300 Subject: [PATCH 1/2] efl: 1.17.0 -> 1.17.1 --- pkgs/desktops/enlightenment/efl.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 3df091fd48a..4b0ad244a77 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,13 +3,15 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1zisnz4x54mn9sm46kcr571faqnazkcglyf0lbz19l34syx40df1"; + sha256 = "0d58bhvwg7c5hp07wywlwnqi01k4jhmpgac7gkx9lil1x6kmahqs"; }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev utillinux systemd ]; From 69cbaebf27230ac62581ee0618e5752e20de7b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 May 2016 09:54:32 -0300 Subject: [PATCH 2/2] elementary: 1.17.0 -> 1.17.1 --- pkgs/desktops/enlightenment/elementary.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix index bf74a6c8b52..10334eb98e9 100644 --- a/pkgs/desktops/enlightenment/elementary.nix +++ b/pkgs/desktops/enlightenment/elementary.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; - sha256 = "0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska"; + sha256 = "149xjq4z71l44w1kd8zks9b2g0wjc9656w46hzd27b58afj1dqc5"; }; - buildInputs = [ pkgconfig efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + nativeBuildInputs = [ pkgconfig automake autoconf ]; + buildInputs = [ efl libdrm gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/include/libdrm" ]; patches = [ ./elementary.patch ]; enableParallelBuilding = true;