Merge pull request #154983 from bobby285271/spice-up

spice-up: 1.8.2 -> 1.9.1

authored by Bobby Rong and committed by GitHub b90729b5 ebcd0d86

+22 -28
+22 -28
pkgs/applications/office/spice-up/default.nix
··· 1 - { lib, stdenv 2 , fetchFromGitHub 3 , nix-update-script 4 - , fetchpatch 5 - , cmake 6 - , gdk-pixbuf 7 - , gtk3 8 - , vala 9 - , gettext 10 , ninja 11 - , pantheon 12 , pkg-config 13 , json-glib 14 - , libgudev 15 , libevdev 16 , libgee 17 , libsoup 18 - , wrapGAppsHook 19 }: 20 21 stdenv.mkDerivation rec { 22 pname = "spice-up"; 23 - version = "1.8.2"; 24 25 src = fetchFromGitHub { 26 owner = "Philip-Scott"; 27 repo = "Spice-up"; 28 rev = version; 29 - sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m"; 30 }; 31 32 - USER = "pbuilder"; 33 - 34 nativeBuildInputs = [ 35 - cmake 36 - gettext 37 ninja 38 pkg-config 39 vala 40 wrapGAppsHook 41 ]; 42 43 buildInputs = [ 44 - pantheon.elementary-icon-theme 45 - pantheon.granite 46 - gdk-pixbuf 47 gtk3 48 json-glib 49 libevdev 50 libgee 51 libgudev 52 libsoup 53 ]; 54 55 - patches = [ 56 - # Fix build with Vala 0.46 57 - # https://github.com/Philip-Scott/Spice-up/pull/288 58 - (fetchpatch { 59 - url = "https://patch-diff.githubusercontent.com/raw/Philip-Scott/Spice-up/pull/288.patch"; 60 - sha256 = "0kyfd8v2sk4cvcq1j8ysp64snfjhnpr3iz7l04lx7if7h372xj39"; 61 - }) 62 - ]; 63 64 passthru = { 65 updateScript = nix-update-script { ··· 74 platforms = platforms.linux; 75 # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ 76 license = licenses.gpl3Plus; 77 - mainProgram = "com.github.philip-scott.spice-up"; 78 }; 79 }
··· 1 + { lib 2 + , stdenv 3 , fetchFromGitHub 4 , nix-update-script 5 + , meson 6 , ninja 7 , pkg-config 8 + , python3 9 + , vala 10 + , wrapGAppsHook 11 + , glib 12 + , gtk3 13 , json-glib 14 , libevdev 15 , libgee 16 + , libgudev 17 , libsoup 18 + , pantheon 19 }: 20 21 stdenv.mkDerivation rec { 22 pname = "spice-up"; 23 + version = "1.9.1"; 24 25 src = fetchFromGitHub { 26 owner = "Philip-Scott"; 27 repo = "Spice-up"; 28 rev = version; 29 + sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc="; 30 }; 31 32 nativeBuildInputs = [ 33 + meson 34 ninja 35 pkg-config 36 + python3 37 vala 38 wrapGAppsHook 39 ]; 40 41 buildInputs = [ 42 + glib 43 gtk3 44 json-glib 45 libevdev 46 libgee 47 libgudev 48 libsoup 49 + pantheon.elementary-icon-theme 50 + pantheon.granite 51 ]; 52 53 + postPatch = '' 54 + chmod +x meson/post_install.py 55 + patchShebangs meson/post_install.py 56 + ''; 57 58 passthru = { 59 updateScript = nix-update-script { ··· 68 platforms = platforms.linux; 69 # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ 70 license = licenses.gpl3Plus; 71 + mainProgram = "com.github.philip_scott.spice-up"; 72 }; 73 }