3
0
Fork 0
forked from mirrors/nixpkgs

e19: updates (close )

EFL: 1.12.2 -> 1.12.3
Enlightenment: 0.19.2 -> 0.19.3
This commit is contained in:
Thomas Strobel 2015-01-27 12:03:33 +01:00 committed by Vladimír Čunát
parent 6437727773
commit 7f9eaf0eff
3 changed files with 9 additions and 9 deletions

View file

@ -3,22 +3,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.12.2"; version = "1.12.3";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "1knxm4xiqxpvpszhyqik43lw36hdwdfh8z7y62803a7093j3yjnw"; sha256 = "1xvcym11j4vs8djx7v70alzyhir1gw2zsm1nl5kv1pfz1kgqc8fv";
}; };
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa buildInputs = [ pkgconfig 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 pulseaudio libsndfile xlibs.libXcursor xlibs.printproto gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto
xlibs.libX11 libdrm udev utillinuxCurses luajit ]; xlibs.libX11 udev utillinuxCurses luajit ];
propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite
xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext
bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr
xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm ];
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full"

View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elementary-${version}"; name = "elementary-${version}";
version = "1.12.2"; version = "1.12.3";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "0qjbhdhnw6h5zc05r2w2j38yapcv9km92k5spcw3zsdnc784vf5i"; sha256 = "0ajljrr72rdz9hniqvsigw7p6dmpqnf0nijrxd2x91gx2cfrwksm";
}; };
buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 -I${e19.efl}/include/efl-1 $NIX_CFLAGS_COMPILE"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {

View file

@ -3,10 +3,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enlightenment-${version}"; name = "enlightenment-${version}";
version = "0.19.2"; version = "0.19.3";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
sha256 = "06il67mlbn24ra6rb7gws5ly67i80lfiprhi5cr71qfmnsr4xbqk"; sha256 = "1myv463agfzgva7fv0y74lk5sxfpf6mxykkc37cb7dyn3cxchdan";
}; };
buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb
xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2