diff options
| author | Linus Heckemann <git@sphalerite.org> | 2017-03-09 12:02:46 +0000 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2017-03-09 12:02:57 +0000 |
| commit | a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3 (patch) | |
| tree | afcd6f3c3f17bfbccae7bc00524d39c240563717 | |
| parent | 603b799bcbcb8d49a9397bbd2896c1a454ee6ff6 (diff) | |
| download | nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.tar nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.tar.gz nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.tar.bz2 nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.tar.lz nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.tar.xz nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.tar.zst nixpkgs-a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3.zip | |
syncthing: use removeReferencesTo
| -rw-r--r-- | pkgs/applications/networking/syncthing/default.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 95ab09542a0..2cb4f0a5922 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,11 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, go, pkgs }: +{ stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }: -let - removeExpr = ref: '' - sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ - ''; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { version = "0.14.24"; name = "syncthing-${version}"; @@ -16,7 +11,7 @@ in stdenv.mkDerivation rec { sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1"; }; - buildInputs = [ go ]; + buildInputs = [ go removeReferencesTo ]; buildPhase = '' mkdir -p src/github.com/syncthing @@ -48,7 +43,7 @@ in stdenv.mkDerivation rec { ''; preFixup = '' - find $out/bin -type f -exec ${removeExpr go} '{}' '+' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+' ''; meta = with stdenv.lib; { |