ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 13:37:21 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #59543 from romildo/upd.efl

Browse Source 
enlightenment.efl: 1.21.1 -> 1.22.1
This commit is contained in:
Renaud 2019-04-27 16:04:53 +02:00 committed by GitHub
commit 2a2ca8ca7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/enlightenment/efl.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "efl-${version}"; name = "efl-${version}";
version = "1.21.1"; version = "1.22.1";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
sha256 = "0a5907h896pvpix7a6idc2fspzy6d78xrzf84k8y9fyvnd14nxs4"; sha256 = "04mfjvaxi36b7r6kn4n0nq2gj97cbldk9iqnr5pf8jnm8plyblr0";
}; };
nativeBuildInputs = [ pkgconfig gtk3 ]; nativeBuildInputs = [ pkgconfig gtk3 ];
@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
libinput utillinux fribidi SDL2 ]; libinput utillinux fribidi SDL2 ];
# as of 1.21.0 compilation will fail due to -Werror=format-security
hardeningDisable = [ "format" ];
# 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 = [ configureFlags = [
"--enable-sdl" "--enable-sdl"
@ -54,6 +51,10 @@ stdenv.mkDerivation rec {
patches = [ ./efl-elua.patch ]; patches = [ ./efl-elua.patch ];
postPatch = ''
patchShebangs src/lib/elementary/config_embed
'';
# bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies. # bin/edje_cc creates $HOME/.run, which would break build of reverse dependencies.
setupHook = writeText "setupHook.sh" '' setupHook = writeText "setupHook.sh" ''
export HOME="$TEMPDIR" export HOME="$TEMPDIR"

4
pkgs/development/python-modules/python-efl/default.nix
View File

@ -4,11 +4,11 @@
buildPythonPackage rec { buildPythonPackage rec {
name = "python-efl-${version}"; name = "python-efl-${version}";
version = "1.21.0"; version = "1.22.0";
src = fetchurl { src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47"; sha256 = "1qhy63c3fs2bxkx2np5z14hyxbr12ii030crsjnhpbyw3mic0s63";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];