b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

endeavour: unstable-2022-06-12 → 42.0

Browse source 
https://gitlab.gnome.org/World/Endeavour/-/compare/f50c981b4d6875d5...v42.0
This commit is contained in:
Bobby Rong 2022-07-30 12:11:32 +08:00 committed by Jan Tojnar
parent c3e4064b74
commit 31094866d6
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/applications/misc/endeavour/default.nix
View file

@ -5,7 +5,6 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, python3
, wrapGAppsHook4 , wrapGAppsHook4
, gettext , gettext
, gnome , gnome
@ -22,19 +21,19 @@
, librest , librest
, json-glib , json-glib
, itstool , itstool
, unstableGitUpdater , gitUpdater
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "endeavour"; pname = "endeavour";
version = "unstable-2022-06-12"; version = "42.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = "Endeavour"; repo = "Endeavour";
rev = "ad4e15f0b58860caf8c6d497795b83b594a9c3e5"; rev = "v${version}";
sha256 = "HRufLoZou9ssQ/qoDG8anhOAtl8IYvFpyjq/XJlsotQ="; sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ=";
}; };
patches = [ patches = [
@ -45,6 +44,20 @@ stdenv.mkDerivation rec {
extraPrefix = ""; extraPrefix = "";
name = "gnome-todo_meson-build.patch"; name = "gnome-todo_meson-build.patch";
}) })
# build: Fix building with -Werror=format-security
# https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132
(fetchpatch {
url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch";
sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo=";
})
# build: Use GNOME module post_install()
# https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135
(fetchpatch {
url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch";
sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
@ -52,7 +65,6 @@ stdenv.mkDerivation rec {
ninja ninja
pkg-config pkg-config
gettext gettext
python3
wrapGAppsHook4 wrapGAppsHook4
itstool itstool
]; ];
@ -75,14 +87,10 @@ stdenv.mkDerivation rec {
json-glib # todoist json-glib # todoist
]; ];
postPatch = ''
chmod +x build-aux/meson/meson_post_install.py
patchShebangs build-aux/meson/meson_post_install.py
'';
passthru = { passthru = {
updateScript = unstableGitUpdater { updateScript = gitUpdater {
url = "https://gitlab.gnome.org/World/Endeavour.git"; inherit pname version;
rev-prefix = "v";
}; };
}; };