git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #59543 from romildo/upd.efl

enlightenment.efl: 1.21.1 -> 1.22.1

commit2a2ca8ca7e5a8e379556032d1023ec66e9afaf23 authorRenaud <c0bw3b@users.noreply.github.com> dateSat 27 Apr 2019, 16:04 (8 years ago) parent48fd8be9a2968d
2 files changed+8−7
pkgs/desktops/enlightenment/efl.nix+6−5 pkgs/development/python-modules/python-efl/default.nix+2−2
pkgs/desktops/enlightenment/efl.nix+6−5
@@ -8,11 +8,11 @@
88
99stdenv.mkDerivation rec {
1010 name = "efl-${version}";
11− version = "1.21.1";
11+ version = "1.22.1";
1212
1313 src = fetchurl {
1414 url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
15− sha256 = "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4";
15+ sha256 = "04mfjvaxi36b7r6kn4n0nq2gj97cbldk9iqnr5pf8jnm8plyblr0";
1616 };
1717
1818 nativeBuildInputs = [ pkgconfig gtk3 ];
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
2929 harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
3030 libinput utillinux fribidi SDL2 ];
3131
32− # as of 1.21.0 compilation will fail due to -Werror=format-security
33− hardeningDisable = [ "format" ];
34−
3532 # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
3633 configureFlags = [
3734 "--enable-sdl"
@@ -54,6 +51,10 @@ stdenv.mkDerivation rec {
5451
5552 patches = [ ./efl-elua.patch ];
5653
54+ postPatch = ''
55+ patchShebangs src/lib/elementary/config_embed
56+ '';
57+
5758 # bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies.
5859 setupHook = writeText "setupHook.sh" ''
5960 export HOME="$TEMPDIR"
pkgs/development/python-modules/python-efl/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 name = "python-efl-${version}";
7− version = "1.21.0";
7+ version = "1.22.0";
88
99 src = fetchurl {
1010 url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
11− sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47";
11+ sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
1212 };
1313
1414 nativeBuildInputs = [ pkgconfig ];