diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 11 | ||||
-rw-r--r-- | pkgs/desktops/xfce/default.nix | 1 | ||||
-rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix | 13 | ||||
-rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix | 31 | ||||
-rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 22 |
5 files changed, 62 insertions, 16 deletions
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index ea232a2c6070..c5d5a400e05b 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -4,15 +4,20 @@ libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mes stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.20.6"; + version = "0.20.7"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj"; + sha256 = "10g1mn1myspdrxl7jcjx6v52g3pmmb0k2bxjgaqdx2s851cyipkw"; }; - buildInputs = [ pkgconfig efl elementary libXdmcp libxcb + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ efl elementary libXdmcp libxcb xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; + preConfigure = '' export USER_SESSION_DIR=$prefix/lib/systemd/user diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 3ea3721362bc..06046bc122b3 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -88,6 +88,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix index 072da2bc5768..c0c8519d63aa 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix @@ -4,20 +4,27 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-cpufreq-plugin"; ver_maj = "1.1"; - ver_min = "1"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1ryaynkxpqpp92pj18bdds869sf560ir1k3bgl8gqnz60z04ak27"; + sha256 = "0crd21l5cw0xgm6w7s049xa36k203yx7l56ssnah9nq1w73n58bl"; }; + name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf gtk ]; + + enableParallelBuilding = true; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "CPU Freq load plugin for Xfce panel"; + license = [ licenses.gpl2Plus ]; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix new file mode 100644 index 000000000000..419efbcbf95a --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxml2, libsoup, upower, +libxfce4ui, libxfce4util, xfce4panel }: + +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; + p_name = "xfce4-weather-plugin"; + ver_maj = "0.8"; + ver_min = "7"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1c35iqqiphazkfdabbjdynk0qkc3r8vxhmk2jc6dkiv8d08727h7"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ gtk libxml2 libsoup upower libxfce4ui libxfce4util + xfce4panel ]; + + enableParallelBuilding = true; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + description = "Weather plugin for the Xfce desktop environment"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index ff4e89a23cf3..e4c448655832 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -4,30 +4,32 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; - ver_maj = "1.5"; - ver_min = "2"; - rev = "d08418c8d55edfacef190ec14e03e1e9a6988101"; + version = "1.5.3"; - name = "${p_name}-${ver_maj}.${ver_min}"; + name = "${p_name}-${version}"; src = fetchFromGitHub { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; - inherit rev; - sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx"; + rev = "v${version}"; + sha256 = "07gmf9x3pw6xajklj0idahbnv0psnkhiqhb88bmkp344jirsx6ba"; }; - buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel - gtk exo garcon ]; + nativeBuildInputs = [ cmake pkgconfig intltool ]; + + buildInputs = [ libxfce4util libxfcegui4 xfce4panel gtk exo garcon ]; + + enableParallelBuilding = true; preFixup = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ - --replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel + --replace $out/bin/xfce4-panel ${xfce4panel.out}/bin/xfce4-panel ''; meta = { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; - description = "Whisker Menu is an alternate application launcher for Xfce"; + description = "Alternate application launcher for Xfce"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.pjbarnoy ]; }; |