public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pantheon.elementary-files: use latest vala

Browse Source
This commit is contained in:
worldofpeace 2019-10-23 06:04:25 -04:00
parent e316e62b84
commit 93e01f3dcd
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/pantheon/apps/elementary-files/default.nix
View File

@ -5,7 +5,7 @@
, meson , meson
, ninja , ninja
, gettext , gettext
, vala_0_44 , vala
, python3 , python3
, desktop-file-utils , desktop-file-utils
, libcanberra , libcanberra
@ -23,6 +23,7 @@
, zeitgeist , zeitgeist
, glib-networking , glib-networking
, elementary-icon-theme , elementary-icon-theme
, fetchpatch
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
python3 python3
vala_0_44 # https://github.com/elementary/files/issues/1081 vala
wrapGAppsHook wrapGAppsHook
]; ];
@ -76,7 +77,14 @@ stdenv.mkDerivation rec {
zeitgeist 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 = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py