nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-12 08:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #165635 from romildo/upd.orage

Browse Source
This commit is contained in:
Sandro 2022-03-27 14:35:08 +02:00 committed by GitHub
commit 0b308b52b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkgs/desktops/xfce/applications/orage/default.nix
View File

@ -1,25 +1,34 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata { lib
, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: , mkXfceDerivation
, dbus-glib
, gtk3
, libical
, libnotify
, libxfce4ui
, popt
, tzdata
, xfce4-panel
, withPanelPlugin ? true
}:
assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; mkXfceDerivation {
category = "apps";
let
inherit (lib) optionals;
in
stdenv.mkDerivation rec {
pname = "orage"; pname = "orage";
version = "4.12.1"; version = "4.16.0";
odd-unstable = false;
sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw=";
src = fetchurl { buildInputs = [
url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; dbus-glib
sha256 = "sha256-PPmqRBroPIaIhl+CIXAlzfPrqhUszkVxd3uMKqjdkGI="; gtk3
}; libical
libnotify
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; libxfce4ui
popt
buildInputs = [ dbus-glib gtk2 libical libnotify popt ] ]
++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; ++ lib.optionals withPanelPlugin [
xfce4-panel
];
postPatch = '' postPatch = ''
substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" 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" 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 postConfigure = ''
# ensure pkgs.libical is used instead of one included in the orage sources
patches = [ rm -rf libical
# 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;
};
meta = with lib; { meta = with lib; {
description = "Simple calendar application with reminders"; description = "Simple calendar application for Xfce";
homepage = "https://git.xfce.org/archive/orage/";
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ] ++ teams.xfce.members; maintainers = with maintainers; [ ] ++ teams.xfce.members;
}; };
} }