about summary refs log tree commit diff
path: root/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix')
-rw-r--r--nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix19
1 files changed, 3 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
index 102f8e9c2128..00c2d5f85d91 100644
--- a/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
+++ b/nixpkgs/pkgs/desktops/xfce/applications/orage/default.nix
@@ -1,44 +1,31 @@
 { lib
 , mkXfceDerivation
-, dbus-glib
 , gtk3
 , libical
 , libnotify
 , libxfce4ui
 , popt
 , tzdata
-, xfce4-panel
-, withPanelPlugin ? true
 }:
 
 mkXfceDerivation {
   category = "apps";
   pname = "orage";
-  version = "4.16.0";
-  odd-unstable = false;
-  sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw=";
+  version = "4.18.0";
+
+  sha256 = "sha256-vL9zexPbQKPqIzK5UqUIxkE9I7hEupkDOJehMgj2Leo=";
 
   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"
     substituteInPlace src/tz_zoneinfo_read.c  --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
-    substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
-  '';
-
-  postConfigure = ''
-    # ensure pkgs.libical is used instead of one included in the orage sources
-    rm -rf libical
   '';
 
   meta = with lib; {