Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f6f4f1ab4a0b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35aea2bff587
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 17, 2020

  1. libdatrie: 0.2.12 -> 2019-12-20 

    The last official release is currently blocking pango on cross-compiles,
also the package has moved to autotools.
    @edwtjo
    edwtjo committed Dec 17, 2020
    Copy the full SHA
    35aea2b View commit details
Showing with 24 additions and 7 deletions.
  1. +24 −7 pkgs/development/libraries/libdatrie/default.nix
31 changes: 24 additions & 7 deletions pkgs/development/libraries/libdatrie/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,40 @@
{ stdenv, fetchurl, makeWrapper, installShellFiles, pkg-config, libiconv }:
{ stdenv, fetchFromGitHub, makeWrapper
, autoreconfHook, autoconf-archive
, installShellFiles, libiconv }:

stdenv.mkDerivation rec {

pname = "libdatrie";
version = "0.2.12";
version = "2019-12-20";

src = fetchurl {
url = "https://github.com/tlwg/libdatrie/releases/download/v${version}/libdatrie-${version}.tar.xz";
sha256 = "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5";
src = fetchFromGitHub {
owner = "tlwg";
repo = "libdatrie";
rev = "d1db08ac1c76f54ba23d63665437473788c999f3";
sha256 = "03dc363259iyiidrgadzc7i03mmfdj8h78j82vk6z53w6fxq5zxc";
};

nativeBuildInputs = [ installShellFiles pkg-config ];
nativeBuildInputs = [
autoreconfHook
autoconf-archive
installShellFiles
];

buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;

preAutoreconf = let
reports = "https://github.com/tlwg/libdatrie/issues";
in
''
sed -i -e "/AC_INIT/,+3d" configure.ac
sed -i "5iAC_INIT(${pname},${version},[${reports}])" configure.ac
'';

postInstall = ''
installManPage man/trietool.1
'';

meta = with stdenv.lib;{
meta = with stdenv.lib; {
homepage = "https://linux.thai.net/~thep/datrie/datrie.html";
description = "This is an implementation of double-array structure for representing trie";
license = licenses.lgpl21Plus;