diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-23 06:04:25 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-23 06:04:34 -0400 |
| commit | 93e01f3dcdf48416fccb77f392289b76019f3d0d (patch) | |
| tree | 584e0a7d9b17361a067c839c22949d1440dffb0a /pkgs/desktops/pantheon | |
| parent | e316e62b84947ff71c425359a39eeb13641621a7 (diff) | |
| download | nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.tar nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.tar.gz nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.tar.bz2 nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.tar.lz nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.tar.xz nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.tar.zst nixlib-93e01f3dcdf48416fccb77f392289b76019f3d0d.zip | |
pantheon.elementary-files: use latest vala
Diffstat (limited to 'pkgs/desktops/pantheon')
| -rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-files/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 8f5837fb2a35..0bb2824b3d3b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -5,7 +5,7 @@ , meson , ninja , gettext -, vala_0_44 +, vala , python3 , desktop-file-utils , libcanberra @@ -23,6 +23,7 @@ , zeitgeist , glib-networking , elementary-icon-theme +, fetchpatch , wrapGAppsHook }: @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { ninja pkgconfig python3 - vala_0_44 # https://github.com/elementary/files/issues/1081 + vala wrapGAppsHook ]; @@ -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 |