summary refs log tree commit diff
path: root/pkgs/development/libraries/fribidi
diff options
context:
space:
mode:
authorAnton-Latukha <anton.latukha@gmail.com>2018-06-02 01:01:37 +0300
committerAnton-Latukha <anton.latukha@gmail.com>2018-06-07 01:28:17 +0300
commit1d84ebc325195bfaf4fa44ae2d2a3021357e85e9 (patch)
treee3c53d3d268280c33873bddd68612fa8e92479c4 /pkgs/development/libraries/fribidi
parent930db86830644bff0b0850db4acbd5c8263c50c1 (diff)
downloadnixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.tar
nixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.tar.gz
nixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.tar.bz2
nixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.tar.lz
nixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.tar.xz
nixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.tar.zst
nixpkgs-1d84ebc325195bfaf4fa44ae2d2a3021357e85e9.zip
fribidi: build with meson, clean-up
Diffstat (limited to 'pkgs/development/libraries/fribidi')
-rw-r--r--pkgs/development/libraries/fribidi/default.nix27
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix
index bd1d4449967..2bc36d1b2b9 100644
--- a/pkgs/development/libraries/fribidi/default.nix
+++ b/pkgs/development/libraries/fribidi/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
+{ stdenv
+, fetchurl
+
+, meson
+, ninja
+, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
-  name = "fribidi-${version}";
-  version = "1.0.3";
+  name = "${pname}-${version}";
+  pname = "fribidi";
+  version = "1.0.4";
 
-  src = fetchFromGitHub {
-    owner = "fribidi";
-    repo = "fribidi";
-    rev = "v${version}";
-    sha256 = "02483nscxc695j9b92clcdf0xb7xkfjry09kqdkkhkzl3vdcj039";
+  # NOTE: 2018-06-06 v1.0.4: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application.
+  src = fetchurl {
+    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "1gipy8fjyn6i4qrhima02x8xs493d21f22dijp88nk807razxgcl";
   };
 
-  # FIXME: Please build with Meson after https://github.com/fribidi/fribidi/issues/79 solved
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  # Configure script checks for glib, but it is only used for tests.
+  nativeBuildInputs = [ meson ninja pkgconfig ];
 
   outputs = [ "out" "devdoc" ];