Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e19: update #12599

Merged
merged 1 commit into from
Feb 25, 2016
Merged

e19: update #12599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions pkgs/desktops/e19/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{ callPackage, pkgs }:
let
openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: {
name = "openjpeg-1.5.1";
openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: rec {
name = "openjpeg-1.5.2";
src = fetchurl {
url = "http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz";
sha1 = "1b0b74d1af4c297fd82806a9325bb544caf9bb8b";
url = "mirror://sourceforge/openjpeg.mirror/${name}.tar.gz";
sha1 = "lahbqvjpsfdxsrm0wsy3pdrp3pzrjvj9";
};
#passthru = { incDir = "openjpeg-1.5.1"; };
});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this openjpeg override was a bad thing to do in the first place. Let's get rid of it. /cc the introducer @ts468. EDIT: maybe it was meant as a temporary measure, but anyway, we should remove it now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vcunat Thank you very much for pointing that out! I introduced it because something depended on openjpeg 1.x, but only openjpeg 2.x was available in nixpkgs back then. Now, we should use the openjpeg 1.x from all-packages.nix, that's right! Maybe we should also check whether enlightenment and efl work with openjpeg 2.x already?

in
rec {
Expand All @@ -23,5 +22,4 @@ rec {
econnman = callPackage ./econnman.nix { };
terminology = callPackage ./terminology.nix { };
rage = callPackage ./rage.nix { };

}
4 changes: 2 additions & 2 deletions pkgs/desktops/e19/econnman.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
};

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 = ''
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 = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/e19/efl.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

stdenv.mkDerivation rec {
name = "efl-${version}";
version = "1.15.0";
version = "1.16.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5";
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
};

buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
Expand Down
10 changes: 5 additions & 5 deletions pkgs/desktops/e19/elementary.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
name = "elementary-${version}";
version = "1.15.0";
version = "1.16.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32";
url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz";
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" ];
patches = [ ./elementary.patch ];
enableParallelBuilding = true;
Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/e19/emotion.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, vlc }:
stdenv.mkDerivation rec {
name = "emotion_generic_players-${version}";
version = "1.15.0";
version = "1.16.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh";
url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym";
};
buildInputs = [ pkgconfig e19.efl vlc ];
NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
Expand Down
10 changes: 5 additions & 5 deletions pkgs/desktops/e19/enlightenment.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }:

stdenv.mkDerivation rec {
name = "enlightenment-${version}";
version = "0.19.8";
version = "0.20.3";
src = fetchurl {
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
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 ];
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 = ''
export USER_SESSION_DIR=$prefix/lib/systemd/user

Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/e19/evas.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
stdenv.mkDerivation rec {
name = "evas_generic_loaders-${version}";
version = "1.15.0";
version = "1.16.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na";
url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm";
};
buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
meta = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/desktops/e19/terminology.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, e19 }:
stdenv.mkDerivation rec {
name = "terminology-${version}";
version = "0.8.0";
version = "0.9.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628";
url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc";
};
buildInputs = [ pkgconfig e19.efl e19.elementary ];
meta = {
Expand Down
14 changes: 10 additions & 4 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22725,17 +22725,23 @@ in modules // {
};
};

pythonefl_1_15 = buildPythonPackage rec {
pythonefl_1_16 = buildPythonPackage rec {
name = "python-efl-${version}";
version = "1.15.0";
version = "1.16.0";
src = pkgs.fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi";
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
sha256 = "142ffki41xj0z2dnf011g8j4b35waviprk4x1dhvy1wgqdywl61l";
};

preConfigure = ''
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 ];
doCheck = false;

meta = {
description = "Python bindings for EFL and Elementary";
homepage = http://enlightenment.org/;
Expand Down