diff options
| author | Tadeo Kondrak <me@tadeo.ca> | 2019-08-03 08:27:50 +0200 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-03 07:27:50 +0100 |
| commit | 8a604d2dbcceaac27654e3b1573f53ed47c3345f (patch) | |
| tree | 940bb3dbecad33badd9c75be4e865928dcd1e9ad /pkgs/development/libraries/fribidi | |
| parent | 5e32d10aeb74836da322905a0d18839dc3d439e3 (diff) | |
| download | nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.tar nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.tar.gz nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.tar.bz2 nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.tar.lz nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.tar.xz nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.tar.zst nixpkgs-8a604d2dbcceaac27654e3b1573f53ed47c3345f.zip | |
fribidi: fix cross compilation (#64655)
Diffstat (limited to 'pkgs/development/libraries/fribidi')
| -rw-r--r-- | pkgs/development/libraries/fribidi/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index b60f4be245e..9798347eadd 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -1,7 +1,6 @@ { stdenv , fetchurl , fetchpatch - , meson , ninja , pkgconfig @@ -10,7 +9,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "fribidi"; version = "1.0.5"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { # NOTE: 2018-06-06 v1.0.5: 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"; + url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "1kp4b1hpx2ky20ixgy2xhj5iygfl7ps5k9kglh1z5i7mhykg4r3a"; }; @@ -33,10 +31,11 @@ stdenv.mkDerivation rec { patchShebangs test ''; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - checkInptus = [ python3 ]; + doCheck = true; + checkInputs = [ python3 ]; meta = with stdenv.lib; { homepage = https://github.com/fribidi/fribidi; |