ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9102 from ts468/upstream.e19

Browse Source 
E19 update to 1.19.8
This commit is contained in:
ts468 2015-08-06 09:02:17 +02:00
commit 863fa55cc1
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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_14 python27Packages.dbus e19.elementary ]; propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages
''; '';
meta = { meta = {

4
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.14.1"; version = "1.15.0";
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 = "16rj4qnpw1ya0bsp9a69w6zjmmhzni7vnc0z4wg819jg5k2njzjf"; sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5";
}; };
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: { stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "elementary-${version}"; name = "elementary-${version}";
version = "1.14.1"; version = "1.15.0";
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 = "100bfzw6q57dnzcqg4zm0rqpvkk7zykfklnn6kcymv80j43xg0p1"; sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32";
}; };
buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; buildInputs = [ pkgconfig e19.efl libdrm gdbm automake 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;

4
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.14.0"; version = "1.15.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.gz";
sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3"; sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh";
}; };
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" ];

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

@ -3,10 +3,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enlightenment-${version}"; name = "enlightenment-${version}";
version = "0.19.5"; version = "0.19.8";
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 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc"; sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi";
}; };
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

4
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.14.0"; version = "1.15.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.gz";
sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl"; sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na";
}; };
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/top-level/python-packages.nix
View File

@ -16021,12 +16021,12 @@ let
}; };
}; };
pythonefl_1_14 = buildPythonPackage rec { pythonefl_1_15 = buildPythonPackage rec {
name = "python-efl-${version}"; name = "python-efl-${version}";
version = "1.14.0"; version = "1.15.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.gz";
sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0"; sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi";
}; };
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"