From fd22984bbb5043258b1c02c6f9fafb0d0b3cb552 Mon Sep 17 00:00:00 2001 From: tbenst Date: Thu, 7 May 2020 10:49:54 -0700 Subject: [PATCH 1/2] zopfli: include all headers --- pkgs/tools/compression/zopfli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 81fdc95d88d..13e1d836938 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm444 -t $out/share/doc/zopfli ../README* + cp $src/src/zopfli/*.h $dev/include/ ''; enableParallelBuilding = true; From d35bcbb4ae0dea6a345af24e73024424f9f4cbed Mon Sep 17 00:00:00 2001 From: tbenst Date: Thu, 7 May 2020 10:50:51 -0700 Subject: [PATCH 2/2] libaec: init at 1.0.4 --- pkgs/development/libraries/libaec/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/libaec/default.nix diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix new file mode 100644 index 00000000000..bf6fd029de1 --- /dev/null +++ b/pkgs/development/libraries/libaec/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libaec"; + version = "1.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.dkrz.de"; + owner = "k202009"; + repo = "libaec"; + rev = "v${version}"; + sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2"; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.dkrz.de/k202009/libaec"; + description = "Adaptive Entropy Coding library"; + license = licenses.bsd2; + maintainers = with maintainers; [ tbenst ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d0bd9b06e0..d1a270d372f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12418,6 +12418,8 @@ in libacr38u = callPackage ../tools/security/libacr38u { }; + libaec = callPackage ../development/libraries/libaec { }; + libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };