From f47888918fd30e76ae72ccdb8197292e23d7c818 Mon Sep 17 00:00:00 2001 From: Struan Robertson Date: Mon, 29 Jan 2024 22:38:39 +0000 Subject: [PATCH 1/2] maintainers: add struan Fix maintainers order --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c18c4f1f184a..afaf053ef298 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18012,6 +18012,12 @@ githubId = 38893265; name = "StrikerLulu"; }; + struan = { + email = "contact@struanrobertson.co.uk"; + github = "struan-robertson"; + githubId = 7543617; + name = "Struan Robertson"; + }; stteague = { email = "stteague505@yahoo.com"; github = "stteague"; From d224835fe81b0d9d3b9f53e39216571ed53e48eb Mon Sep 17 00:00:00 2001 From: Struan Robertson Date: Mon, 29 Jan 2024 17:12:40 +0000 Subject: [PATCH 2/2] libopenraw: init at 0.3.7 Follow naming convention Fix maintainers Make suggested changes This reverts commit 1365633b397c6d695b3004ab9b69528884c42050. --- pkgs/by-name/li/libopenraw/package.nix | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/li/libopenraw/package.nix diff --git a/pkgs/by-name/li/libopenraw/package.nix b/pkgs/by-name/li/libopenraw/package.nix new file mode 100644 index 000000000000..80038929a3f1 --- /dev/null +++ b/pkgs/by-name/li/libopenraw/package.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, boost, gdk-pixbuf, glib, libjpeg, libxml2, lib, pkg-config +, cargo, rustc }: + +stdenv.mkDerivation rec { + pname = "libopenraw"; + version = "0.3.7"; + + src = fetchurl { + url = "https://libopenraw.freedesktop.org/download/libopenraw-${version}.tar.bz2"; + hash = "sha256-VRWyYQNh7zRYC2uXZjURn23ttPCnnVRmL6X+YYakXtU="; + }; + + nativeBuildInputs = [ pkg-config cargo rustc ]; + + buildInputs = [ boost gdk-pixbuf glib libjpeg libxml2 ]; + + postPatch = '' + sed -i configure{,.ac} \ + -e "s,GDK_PIXBUF_DIR=.*,GDK_PIXBUF_DIR=$out/lib/gdk-pixbuf-2.0/2.10.0/loaders," + ''; + + meta = with lib; { + description = "RAW camerafile decoding library"; + homepage = "https://libopenraw.freedesktop.org"; + license = licenses.lgpl3Plus; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = [ maintainers.struan ]; + }; +}