diff options
Diffstat (limited to 'pkgs/applications/networking/sync')
-rw-r--r-- | pkgs/applications/networking/sync/unison/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/networking/sync/wdt/default.nix | 6 |
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 97ee3ed586252..7c0b8dc0747e8 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -2,40 +2,45 @@ , stdenv , fetchFromGitHub , ocamlPackages -, fontschumachermisc -, xset -, makeWrapper , ncurses -, gnugrep , copyDesktopItems , makeDesktopItem +, wrapGAppsHook +, glib +, gsettings-desktop-schemas +, zlib , enableX11 ? true +, Cocoa }: stdenv.mkDerivation rec { pname = "unison"; - version = "2.52.1"; + version = "2.53.0"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; + sha256 = "sha256-4Lyn1UecpVIhoEXIFu35XK4aoAfYGPCZ9L4ZY7224yo="; }; - nativeBuildInputs = [ makeWrapper ] + strictDeps = true; + + nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ ocamlPackages.ocaml ncurses ]; + buildInputs = [ gsettings-desktop-schemas ncurses zlib ] + ++ lib.optional stdenv.isDarwin Cocoa; preBuild = lib.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml + sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.cairo2}"/lib/ocaml/*/site-lib/cairo2)|" src/Makefile.OCaml '' + '' echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; makeFlags = [ "INSTALLDIR=$(out)/bin/" - "UISTYLE=${if enableX11 then "gtk2" else "text"}" + "UISTYLE=${if enableX11 then "gtk3" else "text"}" ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; preInstall = '' @@ -43,11 +48,6 @@ stdenv.mkDerivation rec { ''; postInstall = lib.optionalString enableX11 '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" - done - install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ''; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index f24e1255d5e81..6c6dddee1735e 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-07-08"; + version = "unstable-2022-12-19"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; - sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; + rev = "6a122f24deb4f2ff6c6f97b6a803301a7f7b666c"; + sha256 = "sha256-fH4Inqy7DfMJbW1FYWanScLATu8cZA1n+Vas8ee3xwA="; }; nativeBuildInputs = [ cmake ]; |