diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/desktops/xfce | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce')
6 files changed, 39 insertions, 31 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix index 736e89a4f444..7b9587b988b9 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "1.4.12"; + version = "1.4.13"; src = fetchurl { url = "https://archive.xfce.org/src/apps/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0jhk4x97vip6h7rsw8hbwzfjmz55w6dpcj9v96m54xr15gh31yy3"; + sha256 = "0fg89946z6n8njxn4mv29jksw8yavg8vypsljn9031pjwl3fmh2q"; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://docs.xfce.org/apps/catfish/start; + homepage = "https://docs.xfce.org/apps/catfish/start"; description = "Handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix index f97c07156c58..0ab362aa21d0 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session, runtimeShell }: +{ mkXfceDerivation, polkit, exo, libxfce4util, libxfce4ui, xfconf, iceauth, gtk3, glib, libwnck3, xorg, xfce4-session }: mkXfceDerivation { category = "xfce"; @@ -14,25 +14,9 @@ mkXfceDerivation { # See https://github.com/NixOS/nixpkgs/issues/36468 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - # Don't use startxfce4 in xfce.desktop - # It's has FHS isms - postFixup = '' - chmod +x $out/etc/xdg/xfce4/xinitrc - patchShebangs $out/etc/xdg/xfce4/xinitrc + passthru.xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - substituteInPlace "$out/share/xsessions/xfce.desktop" \ - --replace "Exec=startxfce4" "Exec=$out/etc/xdg/xfce4/xinitrc" - ''; - - passthru = { - xinitrc = "${xfce4-session}/etc/xdg/xfce4/xinitrc"; - - providedSessions = [ - "xfce" - ]; - }; - - meta = { + meta = { description = "Session manager for Xfce"; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix index 2dff3302617c..ed77699f191e 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,7 +5,7 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.0"; + version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m"; diff --git a/nixpkgs/pkgs/desktops/xfce/default.nix b/nixpkgs/pkgs/desktops/xfce/default.nix index 7442ff478f59..9f49299c03a8 100644 --- a/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/default.nix @@ -78,7 +78,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs.gnome3) libsoup; }; - xfdashbooard = callPackage ./applications/xfdashboard {}; + xfdashboard = callPackage ./applications/xfdashboard {}; # TODO: this repo is inactive for many years. Remove? xfce4-volumed = callPackage ./applications/xfce4-volumed { }; diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index 0b31bac8d54b..3abeb74a4355 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Dictionary plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; # see http://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin + broken = true; # see https://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin }; } diff --git a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 83778aa8fffd..64916f92a6ff 100644 --- a/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -1,13 +1,27 @@ -{ mkXfceDerivation, automakeAddFlags, dbus-glib, dbus, gtk3, libpulseaudio -, libnotify, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation +, automakeAddFlags +, dbus-glib +, dbus +, gtk3 +, libpulseaudio +, libnotify +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +, keybinder3 +, glib +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.1"; - sha256 = "1c8krpg3l6ki00ldd9hifc4bddysdm0w3x5w43fkr31j0zrscvfp"; + version = "0.4.2"; + sha256 = "1s996mcniskq42vv7cb9i165pmrfp9c95p5f9rx14hqq8in9mvc5"; - nativeBuildInputs = [ automakeAddFlags ]; + nativeBuildInputs = [ + automakeAddFlags + ]; NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; @@ -15,7 +29,17 @@ mkXfceDerivation { substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 ''; - buildInputs = [ gtk3 libnotify libpulseaudio libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ + glib + gtk3 + keybinder3 + libnotify + libpulseaudio + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; meta = { description = "Adjust the audio volume of the PulseAudio sound system"; |