Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e316e62b8494
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 93e01f3dcdf4
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 23, 2019

  1. pantheon.elementary-files: use latest vala

    @worldofpeace
    worldofpeace committed Oct 23, 2019
    Copy the full SHA
    93e01f3 View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/desktops/pantheon/apps/elementary-files/default.nix
14 changes: 11 additions & 3 deletions pkgs/desktops/pantheon/apps/elementary-files/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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