From 0ff86e21b27dd209e3098be94d088e076bdc27b3 Mon Sep 17 00:00:00 2001 From: Markus Heinrich <68288772+markus-heinrich@users.noreply.github.com> Date: Mon, 28 Feb 2022 18:59:59 +0100 Subject: [PATCH 1/2] maintainers: add mh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6ec7d705ef2e..b7f51c067602 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7952,6 +7952,12 @@ githubId = 668926; name = "Maximilian Güntner"; }; + mh = { + email = "68288772+markus-heinrich@users.noreply.github.com"; + github = "markus-heinrich"; + githubId = 68288772; + name = "Markus Heinrich"; + }; mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; From f44738730cac535423b58c148cbae58c22df3dc7 Mon Sep 17 00:00:00 2001 From: Markus Heinrich <68288772+markus-heinrich@users.noreply.github.com> Date: Mon, 28 Feb 2022 19:03:03 +0100 Subject: [PATCH 2/2] libwbxml: init at 0.11.7 --- .../libraries/libwbxml/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/libwbxml/default.nix diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/development/libraries/libwbxml/default.nix new file mode 100644 index 000000000000..d9446d8c8587 --- /dev/null +++ b/pkgs/development/libraries/libwbxml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, lib, cmake, expat }: + +stdenv.mkDerivation rec { + pname = "libwbxml"; + version = "0.11.7"; + + src = fetchFromGitHub { + owner = "libwbxml"; + repo = "libwbxml"; + rev = "${pname}-${version}"; + sha256 = "sha256:1b81rbkd28d9059vh8n5gql73crp8h7av67kkmr6lhicl08fv2xx"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat ]; + + postPatch = '' + sed -i 's/^SET.*$//' cmake/CMakeLists.txt + ''; + + meta = with lib; { + homepage = "https://github.com/libwbxml/libwbxml"; + description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; + maintainers = with maintainers; [ mh ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1102d18a20ea..222c210c6d77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18802,6 +18802,8 @@ with pkgs; libvori = callPackage ../development/libraries/libvori { }; + libwbxml = callPackage ../development/libraries/libwbxml { }; + libwebcam = callPackage ../os-specific/linux/libwebcam { }; libwebp = callPackage ../development/libraries/libwebp { };