JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #113332 from adisbladis/libthai-cross-multi-out

Browse Source 
libthai: Fix cross & make multi output
This commit is contained in:
adisbladis 2021-02-17 08:51:41 +01:00 committed by GitHub
commit 1afd76b098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libdatrie/default.nix
View File

@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
pname = "libdatrie";
version = "2019-12-20";
outputs = [ "bin" "out" "lib" "dev" ];
src = fetchFromGitHub {
owner = "tlwg";
repo = "libdatrie";

4
pkgs/development/libraries/libthai/default.nix
View File

@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
pname = "libthai";
version = "0.1.28";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://github.com/tlwg/libthai/releases/download/v${version}/libthai-${version}.tar.xz";
sha256 = "04g93bgxrcnay9fglpq2lj9nr7x1xh06i60m7haip8as9dxs3q7z";
@ -11,7 +13,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ installShellFiles libdatrie pkg-config ];
nativeBuildInputs = [ installShellFiles (lib.getBin libdatrie) pkg-config ];
buildInputs = [ libdatrie ];