public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syncthing: use removeReferencesTo

Browse Source
This commit is contained in:
Linus Heckemann 2017-03-09 12:02:46 +00:00
parent 603b799bcb
commit a80e4d76af
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/syncthing/default.nix
View File

@ -1,11 +1,6 @@
{ stdenv, lib, fetchFromGitHub, go, pkgs }: { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
let stdenv.mkDerivation rec {
removeExpr = ref: ''
sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
'';
in stdenv.mkDerivation rec {
version = "0.14.24"; version = "0.14.24";
name = "syncthing-${version}"; name = "syncthing-${version}";
@ -16,7 +11,7 @@ in stdenv.mkDerivation rec {
sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1"; sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1";
}; };
buildInputs = [ go ]; buildInputs = [ go removeReferencesTo ];
buildPhase = '' buildPhase = ''
mkdir -p src/github.com/syncthing mkdir -p src/github.com/syncthing
@ -48,7 +43,7 @@ in stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
find $out/bin -type f -exec ${removeExpr go} '{}' '+' find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {