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

Commits on Apr 26, 2020

  1. unison: fix unison-fsmonitor wrapper in an empty PATH 

    Fixes:
/nix/store/hyk3aky49zm2chq5cwclrsm56iqwfzwj-unison-2.51.2/bin/unison-fsmonitor: line 2: grep: command not found

Happens when running unison in a systemd service.
    @symphorien @bjornfor
    symphorien authored and bjornfor committed Apr 26, 2020
    Copy the full SHA
    e726e34 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/networking/sync/unison/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/sync/unison/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses
{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep
, enableX11 ? true}:

let inherit (ocamlPackages) ocaml lablgtk; in
@@ -38,7 +38,7 @@ stdenv.mkDerivation (rec {
postInstall = if enableX11 then ''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
done
'' else "";