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: b7acafb79565
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35a45ff734bd
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 1, 2019

  1. squash! gnome3.geary: 0.13.2 -> 3.32.0 

    * make geary-attach executable
    @worldofpeace
    worldofpeace committed Apr 1, 2019
    Copy the full SHA
    35a45ff View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/desktops/gnome-3/misc/geary/default.nix
10 changes: 6 additions & 4 deletions pkgs/desktops/gnome-3/misc/geary/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,11 +34,8 @@ stdenv.mkDerivation rec {
postPatch = ''
chmod +x build-aux/post_install.py
patchShebangs build-aux/post_install.py
'';
preFixup = ''
# Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
chmod +x desktop/geary-attach
'';

doCheck = true;
@@ -51,6 +48,11 @@ stdenv.mkDerivation rec {
meson test -v --no-stdsplit
'';

preFixup = ''
# Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
'';

passthru = {
updateScript = gnome3.updateScript {
packageName = pname;