Unverified Commit 8c5e1658 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #224539 from rhoriguchi/resilio-sync-fix 

resilio-sync: fix build with libxcrypt and use autoPatchelfHook
parents f3e6d2ee 8c49f09b

pkgs/applications/networking/resilio-sync/default.nix

+10 −4
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, libxcrypt, ... }:

{ lib, stdenv, fetchurl, autoPatchelfHook, libxcrypt-legacy }:



stdenv.mkDerivation rec {

  pname = "resilio-sync";
@@ -24,11 +24,17 @@ stdenv.mkDerivation rec { 
  dontStrip = true; # Don't strip, otherwise patching the rpaths breaks

  sourceRoot = ".";



  nativeBuildInputs = [

    autoPatchelfHook

  ];



  buildInputs = [

    stdenv.cc.libc

    libxcrypt-legacy

  ];



  installPhase = ''

    install -D rslsync "$out/bin/rslsync"

    patchelf \

      --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \

      --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync"

  '';



  meta = with lib; {