spice-up: 1.8.2 -> 1.9.1
This commit is contained in:
parent
7d5300d2f2
commit
ff372d0ef1
1 changed files with 22 additions and 28 deletions
|
@ -1,65 +1,59 @@
|
||||||
{ lib, stdenv
|
{ lib
|
||||||
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, fetchpatch
|
, meson
|
||||||
, cmake
|
|
||||||
, gdk-pixbuf
|
|
||||||
, gtk3
|
|
||||||
, vala
|
|
||||||
, gettext
|
|
||||||
, ninja
|
, ninja
|
||||||
, pantheon
|
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, vala
|
||||||
|
, wrapGAppsHook
|
||||||
|
, glib
|
||||||
|
, gtk3
|
||||||
, json-glib
|
, json-glib
|
||||||
, libgudev
|
|
||||||
, libevdev
|
, libevdev
|
||||||
, libgee
|
, libgee
|
||||||
|
, libgudev
|
||||||
, libsoup
|
, libsoup
|
||||||
, wrapGAppsHook
|
, pantheon
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "spice-up";
|
pname = "spice-up";
|
||||||
version = "1.8.2";
|
version = "1.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Philip-Scott";
|
owner = "Philip-Scott";
|
||||||
repo = "Spice-up";
|
repo = "Spice-up";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1pix911l4ddn50026a5sbpqfzba6fmw40m1yzbknmkgd2ny28f0m";
|
sha256 = "sha256-FI6YMbqZfaU19k8pS2eoNCnX8O8F99SHHOxMwHC5fTc=";
|
||||||
};
|
};
|
||||||
|
|
||||||
USER = "pbuilder";
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
meson
|
||||||
gettext
|
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
|
python3
|
||||||
vala
|
vala
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pantheon.elementary-icon-theme
|
glib
|
||||||
pantheon.granite
|
|
||||||
gdk-pixbuf
|
|
||||||
gtk3
|
gtk3
|
||||||
json-glib
|
json-glib
|
||||||
libevdev
|
libevdev
|
||||||
libgee
|
libgee
|
||||||
libgudev
|
libgudev
|
||||||
libsoup
|
libsoup
|
||||||
|
pantheon.elementary-icon-theme
|
||||||
|
pantheon.granite
|
||||||
];
|
];
|
||||||
|
|
||||||
patches = [
|
postPatch = ''
|
||||||
# Fix build with Vala 0.46
|
chmod +x meson/post_install.py
|
||||||
# https://github.com/Philip-Scott/Spice-up/pull/288
|
patchShebangs meson/post_install.py
|
||||||
(fetchpatch {
|
'';
|
||||||
url = "https://patch-diff.githubusercontent.com/raw/Philip-Scott/Spice-up/pull/288.patch";
|
|
||||||
sha256 = "0kyfd8v2sk4cvcq1j8ysp64snfjhnpr3iz7l04lx7if7h372xj39";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
updateScript = nix-update-script {
|
updateScript = nix-update-script {
|
||||||
|
@ -74,6 +68,6 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
# The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+
|
# The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
mainProgram = "com.github.philip-scott.spice-up";
|
mainProgram = "com.github.philip_scott.spice-up";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue