tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
efl: 1.17.2 -> 1.18.0
José Romildo Malaquias
9 years ago
198b0b5e
dba09fa4
+9
-13
1 changed file
expand all
collapse all
unified
split
pkgs
desktops
enlightenment
efl.nix
+9
-13
pkgs/desktops/enlightenment/efl.nix
···
1
1
-
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }:
2
2
-
1
1
+
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }:
3
2
4
3
stdenv.mkDerivation rec {
5
4
name = "efl-${version}";
6
6
-
version = "1.17.2";
5
5
+
version = "1.18.0";
7
6
8
7
src = fetchurl {
9
8
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
10
10
-
sha256 = "1dpq5flygrjg931nzsr2ra8icqffzrzbs1lnrzarbpsbmgq3zacs";
9
9
+
sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806";
11
10
};
12
11
13
12
nativeBuildInputs = [ pkgconfig ];
14
13
15
15
-
buildInputs = [ openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
16
16
-
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
14
14
+
buildInputs = [ openssl zlib lz4 freetype fontconfig fribidi SDL2 SDL mesa
15
15
+
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
17
16
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
18
17
xorg.libX11 udev utillinux systemd ];
19
18
···
21
20
xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
22
21
bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
23
22
xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
24
24
-
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib libwebp curl libdrm
23
23
+
harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
25
24
libinput ];
26
25
27
26
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
28
28
-
configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full"
29
29
-
"--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd"
27
27
+
configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full"
28
28
+
"--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--enable-systemd"
30
29
"--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb"
31
30
"--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
32
31
"ac_ct_CXX=foo" ];
33
32
34
34
-
NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
35
35
-
36
33
patches = [ ./efl-elua.patch ];
37
34
38
35
preConfigure = ''
39
39
-
export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
40
36
export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
41
37
'';
42
38
···
50
46
enableParallelBuilding = true;
51
47
52
48
meta = {
53
53
-
description = "Enlightenment Core libraries";
49
49
+
description = "Enlightenment foundation libraries";
54
50
homepage = http://enlightenment.org/;
55
51
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
56
52
platforms = stdenv.lib.platforms.linux;