Skip to content

Commit

Permalink
pantheon.elementary-files: use latest vala
Browse files Browse the repository at this point in the history
  • Loading branch information
worldofpeace committed Oct 23, 2019
1 parent e316e62 commit 93e01f3
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions pkgs/desktops/pantheon/apps/elementary-files/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, meson
, ninja
, gettext
, vala_0_44
, vala
, python3
, desktop-file-utils
, libcanberra
Expand All @@ -23,6 +23,7 @@
, zeitgeist
, glib-networking
, elementary-icon-theme
, fetchpatch
, wrapGAppsHook
}:

Expand Down Expand Up @@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
ninja
pkgconfig
python3
vala_0_44 # https://github.com/elementary/files/issues/1081
vala
wrapGAppsHook
];

Expand All @@ -76,7 +77,14 @@ stdenv.mkDerivation rec {
zeitgeist
];

patches = [ ./hardcode-gsettings.patch ];
patches = [
./hardcode-gsettings.patch
# Fixes https://github.com/elementary/files/issues/1081
(fetchpatch {
url = "https://github.com/elementary/files/commit/76b5cc95466733c2c100a99127ecd4fbd4d2a5ec.patch";
sha256 = "0dn8a9l7i2rdgia1rsc50332fsw0yrbfvpb5z8ba4iiki3lxy2nn";
})
];

postPatch = ''
chmod +x meson/post_install.py
Expand Down

0 comments on commit 93e01f3

Please sign in to comment.