diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:40:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:44:40 +0200 |
| commit | 0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch) | |
| tree | 146620da711f1221bbc226b5ffa36407b50a3fc3 /pkgs/applications/graphics | |
| parent | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff) | |
| parent | d567c486ca5ac5f0c83bb0264c325204a479a5bb (diff) | |
| download | nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.gz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.bz2 nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.lz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.xz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.zst nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.zip | |
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/fondo/default.nix | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index f7d5f099f84c..920b529d61c3 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -1,14 +1,31 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3, glib, gsettings-desktop-schemas, gtk3, libgee, json-glib, glib-networking, libsoup, libunity, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, 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.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "1xflkqzdbyvdjybarvb13vw6p8f2xjlvpr155yaxgjjzjcr1j86y"; + sha256 = "0w7qai261l9m7ckzxc2gj3ywa55wm6p5br1xdk7607ql44lfpgba"; }; nativeBuildInputs = [ @@ -32,6 +49,14 @@ stdenv.mkDerivation rec { pantheon.granite ]; + patches = [ + # Fix hardcoded FHS gsettings path + (fetchpatch { + url = "https://github.com/calo001/fondo/commit/98afdd834201321a3242f0b53bfba4b2ffa04a4c.patch"; + sha256 = "0vvgbgjja6vyrk6in3sgv8jbl4bwxkm6fhllgjzq7r65gkj4jg79"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py |