diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-06 12:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 12:01:50 +0000 |
| commit | cf9f1108594d61308f5552d9037d272e0d50513b (patch) | |
| tree | 7f720185ba3dcde1d8f5ba04559d58eb882eb7e8 /pkgs/desktops | |
| parent | c5a9ac94c807a12fe584165b80b8de6c40f4ec4d (diff) | |
| parent | 2bc8eed5b92a27a361553dbabc81c2ffb56971f0 (diff) | |
| download | nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.tar nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.tar.gz nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.tar.bz2 nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.tar.lz nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.tar.xz nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.tar.zst nixpkgs-cf9f1108594d61308f5552d9037d272e0d50513b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/enlightenment/efl/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/terminology/default.nix | 12 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 14d4572cf6f..fb67cafd63a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0k10mwpdjn57r2kflbzpybhvwl25yqqa2i2fhx0qazyjbzjbrad4"; + sha256 = "0hm6i1f2g4mwj726rc6na38xhys1plbv9swrlc9hrpa87mz6gac6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 10b97436b91..a2e4f717f48 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, pcre, mesa }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g"; + sha256 = "1aasddf2343qj798b5s8qwif3lxj4pyjax6fa9sfi6if9icdkkpq"; }; nativeBuildInputs = [ @@ -18,12 +18,6 @@ stdenv.mkDerivation rec { buildInputs = [ efl - pcre - mesa - ]; - - mesonFlags = [ - "-D edje-cc=${efl}/bin/edje_cc" ]; postPatch = '' |