diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-24 09:19:12 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-24 09:19:12 +0100 |
| commit | c2eac6741bc2bf8ae5ff2e6779492dbe5829092d (patch) | |
| tree | 1c423bc8330a2295281d96c4c3149c6e23b3317d /pkgs/applications/graphics | |
| parent | 917f6f987aa3e0008abc0104e4655b7410da608e (diff) | |
| parent | d7ba3764356317a8642b420a6c5995ed6a0e55a3 (diff) | |
| download | nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.gz nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.bz2 nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.lz nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.xz nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.tar.zst nixpkgs-c2eac6741bc2bf8ae5ff2e6779492dbe5829092d.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/antimony/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/fondo/default.nix | 47 |
2 files changed, 50 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 2e7435b48bb..0257a109568 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -4,19 +4,19 @@ }: let - gitRev = "60a58688e552f12501980c4bdab034ab0f2ba059"; + gitRev = "c0038e3ea82fec6119de364bcbc3370955ed46a2"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation rec { name = "antimony-${version}"; - version = "2018-07-17"; + version = "2018-10-20"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "0pgf6kr23xw012xsil56j5gq78mlirmrlqdm09m5wlgcf4vr6xnl"; + sha256 = "01cjcjppbb0gvh6npcsaidzpfcfzrqhhi07z4v0jkfyi0fl125v4"; }; patches = [ ./paths-fix.patch ]; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix new file mode 100644 index 00000000000..87c161b9aee --- /dev/null +++ b/pkgs/applications/graphics/fondo/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "fondo"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "calo001"; + repo = pname; + rev = version; + sha256 = "0xczqkkq54gjay7wdl8mpil7klfrpvcw2a0n1brq7qrfhsmhc7pc"; + }; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + glib-networking + gsettings-desktop-schemas + gtk3 + json-glib + libgee + libsoup + libunity + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Find the most beautiful wallpapers for your desktop"; + homepage = https://github.com/calo001/fondo; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} |