diff options
Diffstat (limited to 'pkgs/development/libraries/liblouis/default.nix')
-rw-r--r-- | pkgs/development/libraries/liblouis/default.nix | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index 6f630eedf5b9e..32e58c9be0b2f 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -1,7 +1,6 @@ { fetchFromGitHub , lib , stdenv -, fetchpatch , autoreconfHook , pkg-config , gettext @@ -14,25 +13,17 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.21.0"; + version = "3.22.0"; + + outputs = [ "out" "dev" "man" "info" "doc" ]; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8="; + sha256 = "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY="; }; - patches = [ - (fetchpatch { - name = "parenthesize-memcpy-calls-clang.patch"; - url = "https://github.com/liblouis/liblouis/commit/528f38938e9f539a251d9de92ad1c1b90401c4d0.patch"; - sha256 = "0hlhqsvd5wflg70bd7bmssnchk8znzbr93in0zpspzbyap6xz112"; - }) - ]; - - outputs = [ "out" "dev" "man" "info" "doc" ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -71,7 +62,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source braille translator and back-translator"; homepage = "http://liblouis.org/"; - license = licenses.lgpl21; + license = with licenses; [ + lgpl21Plus # library + gpl3Plus # tools + ]; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; }; |