diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-12 00:50:21 +0200 |
| commit | 6c8aed6391a5e9f69cb59792aed58c5f33650275 (patch) | |
| tree | 29bdc77cfbcf01a583c7600f9df3426abe5f1e6d /pkgs/desktops/pantheon/granite/default.nix | |
| parent | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (diff) | |
| parent | 8b57a7573c04cc02b86228bc263afe16bc3fe748 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/desktops/pantheon/granite/default.nix')
| -rw-r--r-- | pkgs/desktops/pantheon/granite/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index bc76ae2fdea35..b93eb2f3f9b42 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -33,6 +33,12 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/granite/raw/0550b44ed6400c9b1ff7e70871913747df2ff323/f/00-datetime-clock-format-gsettings.patch"; sha256 = "0i9yvdmn77x5fjdwd1raw6ym8js8yxa7w6ydc7syx7hcyls00dmq"; }) + + # Fix build latest vala. + (fetchpatch { + url = "https://github.com/elementary/granite/commit/fd26013c84afdeb6300ae2f4a574856753fc2b58.patch"; + sha256 = "01nxqhj8gr61n6wx6ccrqdn25nmbrhhk437k21g4mxqx0gnih265"; + }) ]; passthru = { |