BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6633 from ts468/enlightenment

Browse source 
Update: Enlightenment + EFL
This commit is contained in:
Arseniy Seroka 2015-03-05 23:58:37 +03:00
commit 268a355988
8 changed files with 22 additions and 20 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_12 python27Packages.dbus e19.elementary ]; propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages
''; '';
meta = { meta = {

9
pkgs/desktops/e19/efl.nix
View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.12.3"; version = "1.13.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.gz";
sha256 = "1xvcym11j4vs8djx7v70alzyhir1gw2zsm1nl5kv1pfz1kgqc8fv"; sha256 = "0wjy2n2ggjd9mzv9y0ra21wfjdbw927hdh6pz537p820bnghcivy";
}; };
buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
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 libdrm ]; harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm
libinput ];
# 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"

4
pkgs/desktops/e19/elementary.nix
View file

@ -1,10 +1,10 @@
{ 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.3"; version = "1.13.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.gz";
sha256 = "0ajljrr72rdz9hniqvsigw7p6dmpqnf0nijrxd2x91gx2cfrwksm"; sha256 = "0jfbw48krpzcj944rvyy1rmq7cykad6cwhjh54fhp52lh7c5savk";
}; };
buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
preConfigure = '' preConfigure = ''

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.12.0"; version = "1.13.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 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg"; sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3";
}; };
buildInputs = [ pkgconfig e19.efl vlc ]; buildInputs = [ pkgconfig e19.efl vlc ];
preConfigure = '' preConfigure = ''

6
pkgs/desktops/e19/enlightenment.nix
View file

@ -3,16 +3,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "enlightenment-${version}"; name = "enlightenment-${version}";
version = "0.19.3"; version = "0.19.4";
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 = "1myv463agfzgva7fv0y74lk5sxfpf6mxykkc37cb7dyn3cxchdan"; sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7";
}; };
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
libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/elocation-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
export USER_SESSION_DIR=$prefix/lib/systemd/user export USER_SESSION_DIR=$prefix/lib/systemd/user
substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ substituteInPlace src/modules/xkbswitch/e_mod_parse.c \

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.12.0"; version = "1.13.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 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5"; sha256 = "16yzjk58bxsd0rlnpzrr8as9fxjjiq01swzhpadsgkmq33abgg63";
}; };
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 = {

1
pkgs/desktops/e19/terminology.nix
View file

@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE"
''; '';
meta = { meta = {
description = "The best terminal emulator written with the EFL"; description = "The best terminal emulator written with the EFL";

10
pkgs/top-level/python-packages.nix
View file

@ -13394,12 +13394,12 @@ let
}; };
}; };
pythonefl_1_12 = buildPythonPackage rec { pythonefl_1_13 = buildPythonPackage rec {
name = "python-efl-${version}"; name = "python-efl-${version}";
version = "1.12.0"; version = "1.13.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.bz2";
sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv"; sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82";
}; };
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE"
@ -13408,7 +13408,7 @@ let
meta = { meta = {
description = "Python bindings for EFL and Elementary."; description = "Python bindings for EFL and Elementary.";
homepage = http://enlightenment.org/; homepage = http://enlightenment.org/;
maintainers = [ stdenv.lib.maintainers.matejc ]; maintainers = [ stdenv.lib.maintainers.matejc stdenv.lib.maintainers.tstrobel ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
}; };