summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorMarek Mahut <marek.mahut@gmail.com>2019-08-09 14:20:25 +0200
committerGitHub <noreply@github.com>2019-08-09 14:20:25 +0200
commitacb4fca7ebb6ca7c409a5a61ca280212dc73bf98 (patch)
treedfb64a09c5319a3948019edd2dec896656f196f0 /pkgs/applications/misc
parent2c06560593d58f3d651b8de8c00d71440ed452e9 (diff)
parenteec03192ec78940e11a10bc2f65d59cb117429bb (diff)
downloadnixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.tar
nixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.tar.gz
nixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.tar.bz2
nixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.tar.lz
nixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.tar.xz
nixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.tar.zst
nixpkgs-acb4fca7ebb6ca7c409a5a61ca280212dc73bf98.zip
Merge pull request #64333 from matthiasbeyer/update-hstr
hstr: 1.25 -> 2.0
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/hstr/default.nix26
1 files changed, 20 insertions, 6 deletions
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 1eae8c57fc4..7cdf1a319f6 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,15 +1,29 @@
-{ stdenv, fetchurl, readline, ncurses }:
+{ stdenv, fetchFromGitHub, readline, ncurses
+, autoreconfHook, pkgconfig, gettext }:
 
 stdenv.mkDerivation rec {
   name    = "hstr-${version}";
-  version = "1.25";
+  version = "2.0";
 
-  src = fetchurl {
-    url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg";
+  src = fetchFromGitHub {
+    owner  = "dvorka";
+    repo   = "hstr";
+    rev    = version;
+    sha256 = "1y9vsfbg07gbic0daqy569d9pb9i1d07fym3q7a0a99hbng85s20";
   };
 
-  buildInputs = [ readline ncurses ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ readline ncurses gettext ];
+
+  configurePhase = ''
+    autoreconf -fvi
+    ./configure
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    mv src/hstr $out/bin/
+  '';
 
   meta = {
     homepage = https://github.com/dvorka/hstr;