commit 4fd635404d14aa7ef8d59df3e19298118e033c3a · pyrox.dev/nixpkgs

+3 -3

pkgs/desktops/e19/econnman.nix

··· 8 8 }; 9 9 10 10 buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; 11 - propagatedBuildInputs = [ python27Packages.pythonefl_1_13 python27Packages.dbus e19.elementary ]; 11 + propagatedBuildInputs = [ python27Packages.pythonefl_1_14 python27Packages.dbus e19.elementary ]; 12 12 postInstall = '' 13 - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_13}/lib/python2.7/site-packages 13 + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_14}/lib/python2.7/site-packages 14 14 ''; 15 15 16 16 meta = { 17 17 description = "A user interface for the connman network connection manager"; 18 18 homepage = http://enlightenment.org/; 19 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 19 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 20 20 platforms = stdenv.lib.platforms.linux; 21 21 license = stdenv.lib.licenses.lgpl3; 22 22 };

+14

pkgs/desktops/e19/efl-elua.patch

··· 1 + --- ./src/scripts/elua/core/util.lua.old 2015-05-17 11:59:57.307743243 +0200 2 + +++ ./src/scripts/elua/core/util.lua 2015-05-17 12:39:11.906797377 +0200 3 + @@ -159,7 +159,10 @@ 4 + local ev = os.getenv("ELUA_" .. libname:upper() .. "_LIBRARY_PATH") 5 + local succ, v = load_lib(libname, ev) 6 + if not succ then 7 + - error(v, 2) 8 + + succ, v = load_lib(libname, "$out/lib") 9 + + if not succ then 10 + + error(v, 2) 11 + + end 12 + end 13 + lib = v 14 + loaded_libs[libname] = lib

-8

pkgs/desktops/e19/efl-setup-hook.sh

··· 1 - addDbusIncludePath () { 2 - if test -d "$1/include/dbus-1.0" 3 - then 4 - export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/include/dbus-1.0 -I $1/lib/dbus-1.0/include" 5 - fi 6 - } 7 - 8 - envHooks=(${envHooks[@]} addDbusIncludePath)

+17 -9

pkgs/desktops/e19/efl.nix

··· 1 - { 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 }: 1 + { 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, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }: 2 2 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "efl-${version}"; 6 - version = "1.13.2"; 6 + version = "1.14.0"; 7 7 src = fetchurl { 8 8 url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; 9 - sha256 = "196293zf4pbyd5acs4nzb818yql9r67709ccfj7k3siyws6lsh4q"; 9 + sha256 = "0sb2104b2rayr2ag0n3g8zqds9nxd53mlyvq7650c3cy8hws5a1h"; 10 10 }; 11 11 12 12 buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa 13 13 giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base 14 14 gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto 15 - xlibs.libX11 udev utillinuxCurses luajit ]; 15 + xlibs.libX11 udev utillinuxCurses ]; 16 16 17 17 propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite 18 18 xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext 19 19 bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr 20 - xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 20 + xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat luajit 21 21 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl libdrm 22 22 libinput ]; 23 23 ··· 25 25 configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" 26 26 "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" 27 27 "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" 28 - "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" 28 + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" 29 29 "ac_ct_CXX=foo" ]; 30 30 31 31 NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; 32 32 33 + patches = [ ./efl-elua.patch ]; 34 + 33 35 preConfigure = '' 34 36 export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" 37 + export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" 35 38 ''; 36 39 37 - enableParallelBuilding = true; 40 + postInstall = '' 41 + substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out" 42 + modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done) 43 + substituteInPlace "$out/lib/pkgconfig/efl.pc" --replace 'Cflags: -I''${includedir}/efl-1' \ 44 + 'Cflags: -I''${includedir}/eina-1/eina'"$modules" 45 + ''; 38 46 39 - setupHook = ./efl-setup-hook.sh; 47 + enableParallelBuilding = true; 40 48 41 49 meta = { 42 50 description = "Enlightenment Core libraries"; 43 51 homepage = http://enlightenment.org/; 44 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 52 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 45 53 platforms = stdenv.lib.platforms.linux; 46 54 license = stdenv.lib.licenses.lgpl3; 47 55 };

+7 -8

pkgs/desktops/e19/elementary.nix

··· 1 - { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: 1 + { stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: 2 2 stdenv.mkDerivation rec { 3 3 name = "elementary-${version}"; 4 - version = "1.13.2"; 4 + version = "1.14.0"; 5 5 src = fetchurl { 6 6 url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; 7 - sha256 = "0f8hz60aj4ar8lqnc63nlxkpf3b51scjalgy1iphgjc27hzxcb9i"; 7 + sha256 = "03h9sv5c3473wxf7hcimdf80d2phxl81yv0kzngx4g1b6cdwl1ma"; 8 8 }; 9 - buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 10 - preConfigure = '' 11 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 -I${e19.efl}/include/efl-1 $NIX_CFLAGS_COMPILE" 12 - ''; 9 + buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 10 + NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; 11 + patches = [ ./elementary.patch ]; 13 12 enableParallelBuilding = true; 14 13 meta = { 15 14 description = "Widget set/toolkit"; 16 15 homepage = http://enlightenment.org/; 17 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 16 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 18 17 platforms = stdenv.lib.platforms.linux; 19 18 license = stdenv.lib.licenses.lgpl2; 20 19 };

+18

pkgs/desktops/e19/elementary.patch

··· 1 + --- a/elementary.pc.in 2015-05-16 21:08:14.321148417 +0200 2 + +++ b/elementary.pc.in 2015-05-16 21:08:30.643412725 +0200 3 + @@ -14,4 +14,4 @@ 4 + Requires.private: @requirement_elm_pc@ 5 + Version: @VERSION@ 6 + Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@ 7 + -Cflags: -I${includedir}/elementary-@VMAJ@ 8 + +Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@ 9 + --- a/Makefile.am 2015-05-16 21:08:14.322148433 +0200 10 + +++ b/Makefile.am 2015-05-16 21:08:30.643412725 +0200 11 + @@ -84,6 +84,7 @@ 12 + -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \ 13 + -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \ 14 + -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \ 15 + +-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \ 16 + < $< > $@ || rm $@ 17 + 18 + pc_verbose = $(pc_verbose_@AM_V@)

+4 -6

pkgs/desktops/e19/emotion.nix

··· 1 1 { stdenv, fetchurl, pkgconfig, e19, vlc }: 2 2 stdenv.mkDerivation rec { 3 3 name = "emotion_generic_players-${version}"; 4 - version = "1.13.0"; 4 + version = "1.14.0"; 5 5 src = fetchurl { 6 6 url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; 7 - sha256 = "0gin3cjhfj75v0gjsvv7harbj4fs4r7r1sfi74ncxzna71nrd8r3"; 7 + sha256 = "1n1a5n2wi68n8gjw4yk6cyf11djpqpac0025vysn5w6dqgccfic3"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl vlc ]; 10 - preConfigure = '' 11 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" 12 - ''; 10 + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; 13 11 meta = { 14 12 description = "Extra video decoders"; 15 13 homepage = http://enlightenment.org/; 16 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 14 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 17 15 platforms = stdenv.lib.platforms.linux; 18 16 license = stdenv.lib.licenses.bsd2; 19 17 };

+4 -4

pkgs/desktops/e19/enlightenment.nix

··· 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "enlightenment-${version}"; 6 - version = "0.19.4"; 6 + version = "0.19.5"; 7 7 src = fetchurl { 8 8 url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; 9 - sha256 = "0r3bad700cfx5sq8y61dbz3hxdx9n3nf5hzx40ryqld75yxzwxz7"; 9 + sha256 = "0j66x7x76fbgqfw6fi77v8qy50slw3jnsq3vvs82rrfvniabm8wc"; 10 10 }; 11 11 buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb 12 12 xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 13 13 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; 14 + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ]; 14 15 preConfigure = '' 15 - 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" 16 16 export USER_SESSION_DIR=$prefix/lib/systemd/user 17 17 18 18 substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ ··· 40 40 meta = { 41 41 description = "The Compositing Window Manager and Desktop Shell"; 42 42 homepage = http://enlightenment.org/; 43 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 43 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 44 44 platforms = stdenv.lib.platforms.linux; 45 45 license = stdenv.lib.licenses.bsd2; 46 46 };

+3 -3

pkgs/desktops/e19/evas.nix

··· 1 1 { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: 2 2 stdenv.mkDerivation rec { 3 3 name = "evas_generic_loaders-${version}"; 4 - version = "1.13.2"; 4 + version = "1.14.0"; 5 5 src = fetchurl { 6 6 url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; 7 - sha256 = "06m8p8k8dpyvzdm690zhdzcr7n0ld12bcgjdssjfl66lil5z2mc4"; 7 + sha256 = "04m8vsrigbsg9hm94lxac56frdxil1bib0bjmspa6xsfgi12afwl"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; 10 10 meta = { 11 11 description = "Extra image decoders"; 12 12 homepage = http://enlightenment.org/; 13 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 13 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 14 14 platforms = stdenv.lib.platforms.linux; 15 15 license = stdenv.lib.licenses.gpl2; 16 16 };

+3 -18

pkgs/desktops/e19/rage.nix

··· 2 2 , makeWrapper, lib }: 3 3 stdenv.mkDerivation rec { 4 4 name = "rage-${version}"; 5 - version = "0.1.1"; 5 + version = "0.1.4"; 6 6 src = fetchurl { 7 7 url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; 8 - sha256 = "0jdhbzmnvl0i2zzmjs1wgvxmnv0lm76k7h5llbb8ai34xh4yp3fi"; 8 + sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; 9 9 }; 10 10 buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig 11 11 makeWrapper ]; 12 - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1" 13 - "-I${e19.efl}/include/ecore-1" 14 - "-I${e19.efl}/include/eina-1" 15 - "-I${e19.efl}/include/eina-1/eina" 16 - "-I${e19.efl}/include/eet-1" 17 - "-I${e19.efl}/include/eo-1" 18 - "-I${e19.efl}/include/ecore-evas-1" 19 - "-I${e19.efl}/include/ecore-imf-1" 20 - "-I${e19.efl}/include/ecore-con-1" 21 - "-I${e19.efl}/include/ecore-file-1" 22 - "-I${e19.efl}/include/ecore-input-1" 23 - "-I${e19.efl}/include/eldbus-1" 24 - "-I${e19.efl}/include/efreet-1" 25 - "-I${e19.efl}/include/ethumb-client-1" 26 - "-I${e19.efl}/include/ethumb-1" ]; 27 12 GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ 28 13 gst_all_1.gst-plugins-base 29 14 gst_all_1.gst-plugins-good ··· 39 24 meta = { 40 25 description = "Video + Audio player along the lines of mplayer"; 41 26 homepage = http://enlightenment.org/; 42 - maintainers = with stdenv.lib.maintainers; [ matejc ]; 27 + maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ]; 43 28 platforms = stdenv.lib.platforms.linux; 44 29 license = stdenv.lib.licenses.bsd2; 45 30 };

+1 -8

pkgs/desktops/e19/terminology.nix

··· 7 7 sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628"; 8 8 }; 9 9 buildInputs = [ pkgconfig e19.efl e19.elementary ]; 10 - preConfigure = '' 11 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 $NIX_CFLAGS_COMPILE" 12 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ecore-con-1 $NIX_CFLAGS_COMPILE" 13 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eldbus-1 $NIX_CFLAGS_COMPILE" 14 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" 15 - export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/elocation-1 $NIX_CFLAGS_COMPILE" 16 - ''; 17 10 meta = { 18 11 description = "The best terminal emulator written with the EFL"; 19 12 homepage = http://enlightenment.org/; 20 - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; 13 + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; 21 14 platforms = stdenv.lib.platforms.linux; 22 15 license = stdenv.lib.licenses.bsd2; 23 16 };

+6 -6

pkgs/top-level/python-packages.nix

··· 14964 14964 }; 14965 14965 }; 14966 14966 14967 - pythonefl_1_13 = buildPythonPackage rec { 14967 + pythonefl_1_14 = buildPythonPackage rec { 14968 14968 name = "python-efl-${version}"; 14969 - version = "1.13.0"; 14969 + version = "1.14.0"; 14970 14970 src = pkgs.fetchurl { 14971 - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.bz2"; 14972 - sha256 = "0yy4v0f04dgdz21wd2c09x9w6lzsbq6g12s8895laln44l5aqd82"; 14971 + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; 14972 + sha256 = "1pns5mdyc069z6j1pywjasdd6v9xka5kjdl2yxpd6ds948dia0q0"; 14973 14973 }; 14974 14974 preConfigure = '' 14975 - 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" 14975 + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" 14976 14976 ''; 14977 14977 buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; 14978 14978 meta = { 14979 14979 description = "Python bindings for EFL and Elementary"; 14980 14980 homepage = http://enlightenment.org/; 14981 - maintainers = with maintainers; [ matejc tstrobel ]; 14981 + maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ]; 14982 14982 platforms = platforms.linux; 14983 14983 license = licenses.gpl3; 14984 14984 };