diff options
author | Bobby Rong <rjl931189261@126.com> | 2021-10-16 10:10:45 +0800 |
---|---|---|
committer | Bobby Rong <rjl931189261@126.com> | 2021-10-16 11:56:27 +0800 |
commit | 8e38ff698e41dd8c37f98e495c7857f9777da3c4 (patch) | |
tree | 85e85cb0743c5d4d7ef7745ceca1d4c29cc44648 /pkgs/applications | |
parent | cb10e4ddf6d58987e2b2eb41b827984af27ee98e (diff) | |
download | nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.tar nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.tar.gz nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.tar.bz2 nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.tar.lz nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.tar.xz nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.tar.zst nixpkgs-8e38ff698e41dd8c37f98e495c7857f9777da3c4.zip |
notejot: 3.1.5 -> 3.2.0
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/notejot/default.nix | 32 | ||||
-rw-r--r-- | pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch | 20 |
2 files changed, 38 insertions, 14 deletions
diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 952a7b00d08..435bbda24d0 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -2,47 +2,51 @@ , stdenv , fetchFromGitHub , gtk4 -, gtksourceview +, hicolor-icon-theme , json-glib , libadwaita , libgee , meson , ninja , nix-update-script -, pantheon , pkg-config , python3 , vala -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-wsHQvN+sqAMs1QldiRoc9JlF4d54JFqNkqC+lyuHC7M="; + hash = "sha256-WyW1tGhO3+OykNa8BRavi93cBMOSBJw0M+0bwQHJOjU="; }; + patches = [ + # build: use gtk4-update-icon-cache + # https://github.com/lainsce/notejot/pull/307 + ./use-gtk4-update-icon-cache.patch + ]; + nativeBuildInputs = [ meson ninja - vala pkg-config python3 - wrapGAppsHook + vala + wrapGAppsHook4 ]; + buildInputs = [ gtk4 - gtksourceview + hicolor-icon-theme json-glib libadwaita libgee - pantheon.elementary-icon-theme - pantheon.granite ]; postPatch = '' @@ -50,6 +54,10 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://github.com/lainsce/notejot"; description = "Stupidly-simple sticky notes applet"; @@ -57,8 +65,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; platforms = platforms.linux; }; - - passthru.updateScript = nix-update-script { - attrPath = pname; - }; } diff --git a/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch new file mode 100644 index 00000000000..9431c43cef6 --- /dev/null +++ b/pkgs/applications/misc/notejot/use-gtk4-update-icon-cache.patch @@ -0,0 +1,20 @@ +diff --git a/build-aux/post_install.py b/build-aux/post_install.py +index 1278304..fface6d 100644 +--- a/build-aux/post_install.py ++++ b/build-aux/post_install.py +@@ -2,11 +2,13 @@ + import os + import subprocess + +-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') ++install_prefix = os.environ['MESON_INSTALL_PREFIX'] ++icondir = os.path.join(install_prefix, 'share', 'icons', 'hicolor') ++schemadir = os.path.join(install_prefix, 'share', 'glib-2.0', 'schemas') + + if not os.environ.get('DESTDIR'): + print('Compiling gsettings schemas…') + subprocess.call(['glib-compile-schemas', schemadir], shell=False) + + print('Rebuilding desktop icons cache...') +- subprocess.call(['gtk-update-icon-cache', '/usr/share/icons/hicolor/'], shell=False) ++ subprocess.call(['gtk4-update-icon-cache', '-qtf', icondir], shell=False) |