diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 10:51:11 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 10:51:11 +0200 |
commit | 37242d98de844e26d5cf84734372218355a42b75 (patch) | |
tree | fe37eac82b1538a072ae416d32049d778750a2df /pkgs/desktops | |
parent | 825c08e368947e775278a74d58d269bb38c60c8f (diff) | |
parent | 0529e4d90885b4e911162e8f8be077ae22322eba (diff) | |
download | nixlib-37242d98de844e26d5cf84734372218355a42b75.tar nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.gz nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.bz2 nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.lz nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.xz nixlib-37242d98de844e26d5cf84734372218355a42b75.tar.zst nixlib-37242d98de844e26d5cf84734372218355a42b75.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/mate/atril/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/mate/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/mate/engrampa/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/mate/eom/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/mate/libmateweather/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-control-center/default.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-desktop/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-notification-daemon/default.nix | 36 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-panel/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-session-manager/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/srcs.nix | 8 |
11 files changed, 61 insertions, 15 deletions
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 089b54de15e4..5b02c6ad117f 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler + hicolor_icon_theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 3cac721c0eb3..0db1d3f74c0e 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -23,6 +23,7 @@ let mate-icon-theme = callPackage ./mate-icon-theme { }; mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { }; mate-menus = callPackage ./mate-menus { }; + mate-notification-daemon = callPackage ./mate-notification-daemon { }; mate-panel = callPackage ./mate-panel { }; mate-session-manager = callPackage ./mate-session-manager { }; mate-settings-daemon = callPackage ./mate-settings-daemon { }; @@ -41,6 +42,7 @@ let mate-desktop mate-icon-theme mate-menus + mate-notification-daemon mate-panel mate-session-manager mate-settings-daemon diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index dea2bea5ee9b..026890829890 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { libxml2 gnome3.gtk mate.caja + hicolor_icon_theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 1c27958b0c97..c7651e1b5be8 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool + hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index aafc0fa9ceba..4d7c9dd61d6d 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--enable-locations-compression" ]; + preFixup = "rm -f $out/share/icons/mate/icon-theme.cache"; + meta = with stdenv.lib; { description = "Library to access weather information from online services for MATE"; homepage = https://github.com/mate-desktop/libmateweather; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index ad91069356f1..3b04d4b48aa1 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, desktop_file_utils, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, + libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3, + desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook +}: stdenv.mkDerivation rec { name = "mate-control-center-${version}"; @@ -24,8 +27,11 @@ stdenv.mkDerivation rec { dbus_glib libxklavier libcanberra_gtk3 + librsvg + libappindicator-gtk3 gnome3.gtk gnome3.dconf + hicolor_icon_theme mate.mate-desktop mate.libmatekbd mate.mate-menus diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index eb247efe0525..8fea89cdcb6b 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -20,11 +20,6 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.dconf gnome3.gtk - gnome3.defaultIconTheme - ]; - - propagatedUserEnvPkgs = [ - gnome3.gnome_themes_standard ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix new file mode 100644 index 000000000000..5a64727419c6 --- /dev/null +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3, + libnotify, libwnck3, gnome3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-notification-daemon-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "0rhhv99ipxy7l4fdgwvqp3g0c3d4njq0fhkag2vs1nwc6kx0h7sc"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + dbus_glib + libcanberra_gtk3 + libnotify + libwnck3 + gnome3.gtk + ]; + + meta = with stdenv.lib; { + description = "Notification daemon for MATE"; + homepage = https://github.com/mate-desktop/mate-notification-daemon; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index cc6fd6c363c4..d3e6f11fd947 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { libwnck3 librsvg libxml2 + hicolor_icon_theme gnome3.gtk gnome3.dconf mate.libmateweather diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 316104334ac8..48d2890388a7 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { dbus_glib systemd xtrans + hicolor_icon_theme xorg.libSM gnome3.gtk3 gnome3.gsettings_desktop_schemas diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 4e582bcef10a..854b86c1640d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -131,11 +131,11 @@ }; }; kscreenlocker = { - version = "5.10.5"; + version = "5.10.5.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.tar.xz"; - sha256 = "07c8x4pj9adwwm5036wbrrw2sj8xi9d8b6d7qya6bam9xrq0mxkb"; - name = "kscreenlocker-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz"; + sha256 = "03ih0dyyjljv40wl7mpbssfirkkljw8mnpjjhzk357lzadkplzvp"; + name = "kscreenlocker-5.10.5.1.tar.xz"; }; }; ksshaskpass = { |