diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:37:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-01 17:38:18 +0200 |
| commit | 2d6179d1e8c15d341f0cade0ab55653623eb5038 (patch) | |
| tree | d69260a6e740c174c9616b2bb6d24a0e98ba8f6e /pkgs/desktops/enlightenment/enlightenment.nix | |
| parent | 2e7cb61cfbe6df23a2e223f98ae61e1a385ea747 (diff) | |
| parent | 9a56eee0b144c1e63afc0b5c9e562da9565ea7f0 (diff) | |
| download | nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.gz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.bz2 nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.lz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.xz nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.tar.zst nixlib-2d6179d1e8c15d341f0cade0ab55653623eb5038.zip | |
Merge branch 'master' into staging
A few trivial conflicts due to *Platforms mass replace.
Diffstat (limited to 'pkgs/desktops/enlightenment/enlightenment.nix')
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 9119d5e93d81..8edf702a24c6 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.22.3"; + version = "0.22.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "16zydv7z94aw3rywmb9gr8ya85k7b75h22wng95lfx1x0y1yb0ad"; + sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r"; }; nativeBuildInputs = [ @@ -57,16 +57,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # In order to get the available keyboard layouts Enlightenment looks for - # the file xorg.lst, that should be provided by xkeyboard-config (when - # configured with option --with-xkb-rules-symlink=xorg). Currently - # xkeyboard-config is not configured with this option in - # NixOS. Therefore it is needed to add base.lst (which xorg.lst would be - # a symbolic link to) explicitly as an alternative. - - sed "/#ifdef XKB_BASE/a XKB_BASE \"\/rules\/base.lst\"," \ - -i src/modules/wizard/page_011.c src/modules/xkbswitch/e_mod_parse.c - # edge_cc is a binary provided by efl and cannot be found at the directory # given by e_prefix_bin_get(), which is $out/bin |