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

Merge pull request #12599 from ftrvxmtrx/e19-update-1.16.1 

e19: update
This commit is contained in:
zimbatm 2016-02-25 23:50:31 +00:00
parent 35f47333d0 bea389d7d5
commit 71e1fd1a0b
9 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/e19/default.nix
View File

@ -1,12 +1,11 @@
{ callPackage, pkgs }: { callPackage, pkgs }:
let let
openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: { openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: rec {
name = "openjpeg-1.5.1"; name = "openjpeg-1.5.2";
src = fetchurl { src = fetchurl {
url = "http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz"; url = "mirror://sourceforge/openjpeg.mirror/${name}.tar.gz";
sha1 = "1b0b74d1af4c297fd82806a9325bb544caf9bb8b"; sha1 = "lahbqvjpsfdxsrm0wsy3pdrp3pzrjvj9";
}; };
#passthru = { incDir = "openjpeg-1.5.1"; };
}); });
in in
rec { rec {
@ -23,5 +22,4 @@ rec {
econnman = callPackage ./econnman.nix { }; econnman = callPackage ./econnman.nix { };
terminology = callPackage ./terminology.nix { }; terminology = callPackage ./terminology.nix { };
rage = callPackage ./rage.nix { }; rage = callPackage ./rage.nix { };
} }

4
pkgs/desktops/e19/econnman.nix
View File

@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ]; propagatedBuildInputs = [ python27Packages.pythonefl_1_16 python27Packages.dbus e19.elementary ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_16}/lib/python2.7/site-packages
''; '';
meta = { meta = {

6
pkgs/desktops/e19/efl.nix
View File

@ -3,10 +3,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.15.0"; version = "1.16.1";
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.xz";
sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5"; sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
}; };
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa

10
pkgs/desktops/e19/elementary.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }: { stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elementary-${version}"; name = "elementary-${version}";
version = "1.15.0"; version = "1.16.1";
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.xz";
sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32"; sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y";
}; };
buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
patches = [ ./elementary.patch ]; patches = [ ./elementary.patch ];
enableParallelBuilding = true; enableParallelBuilding = true;

6
pkgs/desktops/e19/emotion.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, vlc }: { stdenv, fetchurl, pkgconfig, e19, vlc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emotion_generic_players-${version}"; name = "emotion_generic_players-${version}";
version = "1.15.0"; version = "1.16.0";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh"; sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym";
}; };
buildInputs = [ pkgconfig e19.efl vlc ]; buildInputs = [ pkgconfig e19.efl vlc ];
NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];

10
pkgs/desktops/e19/enlightenment.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2 { stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid
, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enlightenment-${version}"; name = "enlightenment-${version}";
version = "0.19.8"; version = "0.20.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 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi"; sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j";
}; };
buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb
xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid
libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" "-I${libuuid}/include/uuid" ];
preConfigure = '' preConfigure = ''
export USER_SESSION_DIR=$prefix/lib/systemd/user export USER_SESSION_DIR=$prefix/lib/systemd/user

6
pkgs/desktops/e19/evas.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "evas_generic_loaders-${version}"; name = "evas_generic_loaders-${version}";
version = "1.15.0"; version = "1.16.0";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na"; sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm";
}; };
buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
meta = { meta = {

6
pkgs/desktops/e19/terminology.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19 }: { stdenv, fetchurl, pkgconfig, e19 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "terminology-${version}"; name = "terminology-${version}";
version = "0.8.0"; version = "0.9.1";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc";
}; };
buildInputs = [ pkgconfig e19.efl e19.elementary ]; buildInputs = [ pkgconfig e19.efl e19.elementary ];
meta = { meta = {

14
pkgs/top-level/python-packages.nix
View File

@ -23958,17 +23958,23 @@ in modules // {
}; };
}; };
pythonefl_1_15 = buildPythonPackage rec { pythonefl_1_16 = buildPythonPackage rec {
name = "python-efl-${version}"; name = "python-efl-${version}";
version = "1.15.0"; version = "1.16.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi"; sha256 = "142ffki41xj0z2dnf011g8j4b35waviprk4x1dhvy1wgqdywl61l";
}; };
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
''; '';
preBuild = "${python}/bin/${python.executable} setup.py build_ext";
installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ];
doCheck = false;
meta = { meta = {
description = "Python bindings for EFL and Elementary"; description = "Python bindings for EFL and Elementary";
homepage = http://enlightenment.org/; homepage = http://enlightenment.org/;