diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce/applications')
3 files changed, 40 insertions, 43 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix index 4e5028a6a599..102f8e9c2128 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,25 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata -, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: - -assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; - -let - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { +{ lib +, mkXfceDerivation +, dbus-glib +, gtk3 +, libical +, libnotify +, libxfce4ui +, popt +, tzdata +, xfce4-panel +, withPanelPlugin ? true +}: + +mkXfceDerivation { + category = "apps"; pname = "orage"; - version = "4.12.1"; - - src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-PPmqRBroPIaIhl+CIXAlzfPrqhUszkVxd3uMKqjdkGI="; - }; - - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; - - buildInputs = [ dbus-glib gtk2 libical libnotify popt ] - ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; + version = "4.16.0"; + odd-unstable = false; + sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw="; + + buildInputs = [ + dbus-glib + gtk3 + libical + libnotify + libxfce4ui + popt + ] + ++ lib.optionals withPanelPlugin [ + xfce4-panel + ]; postPatch = '' substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" @@ -27,27 +36,13 @@ stdenv.mkDerivation rec { substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources - - patches = [ - # Fix build with libical 3.0 - (fetchpatch { - name = "fix-libical3.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10"; - sha256 = "sha256-bsnQMGmeo4mRNGM/7UYXez2bNopXMHRFX7VFVg0IGtE="; - }) - ]; - - passthru.updateScript = xfce.archiveUpdater { - category = "apps"; - inherit pname version; - }; + postConfigure = '' + # ensure pkgs.libical is used instead of one included in the orage sources + rm -rf libical + ''; meta = with lib; { - description = "Simple calendar application with reminders"; - homepage = "https://git.xfce.org/archive/orage/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + description = "Simple calendar application for Xfce"; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 99e5457a0106..1e8a9230661f 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.9"; + version = "1.9.10"; odd-unstable = false; - sha256 = "sha256-QOYJl+bxRk0+spgtGADPgkw2lPLfQOwTZQuZNHWq39c="; + sha256 = "sha256-i3QdQij58JYv3fWdESUeTV0IW3A8RVGNtmuxUc6FUMg="; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 4d887f96ffd2..65611f73a1d2 100644 --- a/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }: mkXfceDerivation { category = "apps"; @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; + meta = with lib; { description = "A modern terminal emulator"; maintainers = with maintainers; [ ] ++ teams.xfce.members; |