JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #98896 from romildo/upd.efl

Browse Source 
{enlightenment.efl,pythonPackages.pythonefl}: 1.24.3 -> 1.25.0
This commit is contained in:
José Romildo Malaquias 2020-09-28 09:04:45 -03:00 committed by GitHub
commit d2f65bfe8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/enlightenment/efl/default.nix
View File

@ -54,11 +54,11 @@
stdenv.mkDerivation rec {
pname = "efl";
version = "1.24.3";
version = "1.25.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
sha256 = "de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a";
sha256 = "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k";
};
nativeBuildInputs = [
@ -142,16 +142,17 @@ stdenv.mkDerivation rec {
"--buildtype=release"
"-D build-tests=false" # disable build tests, which are not working
"-D drm=true"
"-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs
"-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs
"-D embedded-lz4=false"
"-D fb=true"
"-D network-backend=connman"
"-D sdl=true"
"-D elua=true"
"-D bindings=lua,cxx"
];
patches = [
./efl-elua.patch
./0002-efreet-more-stat-info-changes.patch
];
postPatch = ''
@ -174,11 +175,10 @@ stdenv.mkDerivation rec {
source "$setupHook"
'';
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
postInstall = ''
# fix use of $out variable
substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out"
rm "$out/share/elua/core/util.lua.orig"
# add all module include dirs to the Cflags field in efl.pc
modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done)

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

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "python-efl";
version = "1.24.0";
version = "1.25.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy";
sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r";
};
nativeBuildInputs = [ pkgconfig ];