diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-14 12:29:26 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-14 12:29:26 +0800 |
| commit | ff372d0ef113d714249c34a6bc53cb89d6635afe (patch) | |
| tree | 521bd920ee21c4eeb962d678761e5189400ac8a1 | |
| parent | 7d5300d2f2f20372ac9dafb53b75e48406005ea0 (diff) | |
| download | nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.tar nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.tar.gz nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.tar.bz2 nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.tar.lz nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.tar.xz nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.tar.zst nixpkgs-ff372d0ef113d714249c34a6bc53cb89d6635afe.zip | |
spice-up: 1.8.2 -> 1.9.1
| -rw-r--r-- | pkgs/applications/office/spice-up/default.nix | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 7b72ddcf0d9..1de5a8b817b 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -1,65 +1,59 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch -, cmake -, gdk-pixbuf -, gtk3 -, vala -, gettext +, meson , ninja -, pantheon , pkg-config +, python3 +, vala +, wrapGAppsHook +, glib +, gtk3 , json-glib -, libgudev , libevdev , libgee +, libgudev , libsoup -, wrapGAppsHook +, pantheon }: stdenv.mkDerivation rec { pname = "spice-up"; - version = "1.8.2"; + version = "1.9.1"; src = fetchFromGitHub { owner = "Philip-Scott"; repo = "Spice-up"; rev = version; - sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m"; + sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc="; }; - USER = "pbuilder"; - nativeBuildInputs = [ - cmake - gettext + meson ninja pkg-config + python3 vala wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - pantheon.granite - gdk-pixbuf + glib gtk3 json-glib libevdev libgee libgudev libsoup + pantheon.elementary-icon-theme + pantheon.granite ]; - patches = [ - # Fix build with Vala 0.46 - # https://github.com/Philip-Scott/Spice-up/pull/288 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/Philip-Scott/Spice-up/pull/288.patch"; - sha256 = "0kyfd8v2sk4cvcq1j8ysp64snfjhnpr3iz7l04lx7if7h372xj39"; - }) - ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; passthru = { updateScript = nix-update-script { @@ -74,6 +68,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; - mainProgram = "com.github.philip-scott.spice-up"; + mainProgram = "com.github.philip_scott.spice-up"; }; } |