diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-10 08:56:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-10 08:56:39 +0200 |
| commit | dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907 (patch) | |
| tree | 3fb86f38ee7bb816ca0e57e6c035491cf7e09c29 /pkgs/desktops | |
| parent | 9d6ac8eadaade4f8564aa54b64bb9eb0dabfa322 (diff) | |
| parent | 6521a83efe84a8c15b277e782700f4cf1936d3f9 (diff) | |
| download | nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.gz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.bz2 nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.lz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.xz nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.tar.zst nixlib-dab3272f47f13c2a7442e3aec6b4b5bcc1bfd907.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/enlightenment/efl.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/lxqt/core/lxqt-session/default.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index e93195de1f8a..67840a4c9e61 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.20.2"; + version = "1.20.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "0zll6k4xbbdsxqg53g8jddgv889g5m1xh20i03iz5a52y2bcnh55"; + sha256 = "148i8awjdrqzd0xqfc6q4qvhhs46jl15nx7n2nii7lrwzx502wqj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix index 35879af28e88..ba0bb69ce926 100644 --- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { qtbase qttools qtsvg + qtx11extras kwindowsystem liblxqt libqtxdg |