Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dcaf6f48b820
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d9f70e54cd0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 5, 2019

  1. spice-up: 1.7.0 -> 1.8.0 

    (cherry picked from commit f271f94)
Fixed build.

ZHF: #56826
    @xiorcale @worldofpeace
    xiorcale authored and worldofpeace committed Mar 5, 2019
    5
    Copy the full SHA
    8d9f70e View commit details
Showing with 14 additions and 16 deletions.
  1. +14 −16 pkgs/applications/office/spice-up/default.nix
30 changes: 14 additions & 16 deletions pkgs/applications/office/spice-up/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
{ stdenv
, fetchFromGitHub
, cmake
, gdk_pixbuf
, gtk3
, gettext
, libxml2
, ninja
, pantheon
, pkgconfig
, gtk3
, gnome3
, gobject-introspection
, json-glib
, cmake
, ninja
, libgudev
, libevdev
, libgee
, libsoup
, pantheon
, wrapGAppsHook }:

stdenv.mkDerivation rec {
name = "spice-up-${version}";
version = "1.7.0";
pname = "spice-up";
version = "1.8.0";

src = fetchFromGitHub {
owner = "Philip-Scott";
repo = "Spice-up";
rev = version;
sha256 = "1qb1hlw7g581dmgg5mh832ixjkcgqm3lqzj6xma2cz8wdncwwjaq";
sha256 = "0jbqgf936pqss8ha27fcyjbhvkn4ij96b3d87c6gcx90glmq33zb";
};

USER = "nix-build-user";
USER = "pbuilder";

nativeBuildInputs = [
cmake
gettext
gobject-introspection # For setup hook
libxml2
ninja
pkgconfig
pantheon.vala
@@ -41,18 +38,19 @@ stdenv.mkDerivation rec {
buildInputs = [
pantheon.elementary-icon-theme
pantheon.granite
gnome3.libgee
gdk_pixbuf
gtk3
json-glib
libevdev
libgee
libgudev
libsoup
];

meta = with stdenv.lib; {
description = "Create simple and beautiful presentations on the Linux desktop";
description = "Create simple and beautiful presentations";
homepage = https://github.com/Philip-Scott/Spice-up;
maintainers = with maintainers; [ samdroid-apps ];
maintainers = with maintainers; [ samdroid-apps kjuvi ] ++ pantheon.maintainers;
platforms = platforms.linux;
# The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+
license = licenses.gpl3Plus;