diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-18 03:04:54 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-18 03:04:56 +0100 |
commit | 8b57eb8f17698b595f83fc5d19d7096792f31f89 (patch) | |
tree | 162d5403b57270d0bc50e0d2b3f11a521ef0fd37 /pkgs/tools/misc/tldr | |
parent | 907481aca8f6a452766f5af53d5616c3ec9f4d49 (diff) |
tldr: use fetchFromGitHub; pkgconfig
pkgconfig is unrelated, but trivial (removes a harmless but distracting error message) and doesn't warrant its own commit.
Diffstat (limited to 'pkgs/tools/misc/tldr')
-rw-r--r-- | pkgs/tools/misc/tldr/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index f6ba3d1710065..46dbc2a2a2240 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, clang, curl, libzip }: +{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }: let version = "1.1.0"; in stdenv.mkDerivation { name = "tldr-${version}"; - src = fetchurl { - url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz"; - sha256 = "0f2ijx17hv64w6zrv0vhj1j1jikzsj42657510vxcqqr8zanzlpf"; + src = fetchFromGitHub { + sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz"; + rev = "v${version}"; + repo = "tldr-cpp-client"; + owner = "tldr-pages"; }; buildInputs = [ curl clang libzip ]; + nativeBuildInputs = [ pkgconfig ]; - preBuild = '' + preConfigure = '' cd src ''; installPhase = '' - install -d $prefix/bin - install tldr $prefix/bin + install -Dm755 {.,$out/bin}/tldr ''; meta = with stdenv.lib; { |