public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15748 from romildo/upd.enlightenment 

efl: 1.17.0 -> 1.17.1, elementary: 1.17.0 -> 1.17.1
This commit is contained in:
Joachim Fasting 2016-05-28 16:06:23 +02:00
parent 4561a649f4 69cbaebf27
commit b31bbf43fb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/desktops/enlightenment/efl.nix
View File

@ -3,13 +3,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.17.0"; version = "1.17.1";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; 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 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 gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
xorg.libX11 udev utillinux systemd ]; xorg.libX11 udev utillinux systemd ];

7
pkgs/desktops/enlightenment/elementary.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }: { stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elementary-${version}"; name = "elementary-${version}";
version = "1.17.0"; version = "1.17.1";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; 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" ]; NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/include/libdrm" ];
patches = [ ./elementary.patch ]; patches = [ ./elementary.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;