diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-02 10:22:22 -0200 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2017-11-02 10:22:22 -0200 |
| commit | 82e75a0bacb85a0bfee292e53e280f69dc92a0a2 (patch) | |
| tree | 2592050179097d066d02d2c0056f5e072e279e81 /pkgs/desktops | |
| parent | d9f9c0d0d11dbe3f3c9535d816c38b7c0898bb66 (diff) | |
| parent | ad4f757783b0ea6c4c4ed1c0ffe92005e677dfe7 (diff) | |
| download | nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.tar nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.tar.gz nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.tar.bz2 nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.tar.lz nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.tar.xz nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.tar.zst nixlib-82e75a0bacb85a0bfee292e53e280f69dc92a0a2.zip | |
Merge branch 'upd.lxqt' of github.com:romildo/nixpkgs into upd.lxqt
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 10e5f97c38fb..585f79ddea67 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -45,7 +45,7 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2 + inherit (pkgs) glib gtk2 webkitgtk gtk3 gtkmm3 libcanberra_gtk2 clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; @@ -56,7 +56,6 @@ let gtkmm = gtkmm3; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - webkitgtk = webkitgtk216x; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index 1a357f1d0fe8..77a49410bb60 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, fetchurl, + stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, |