From beb073b41fb3db83d2e3c758e65f1df6082448ba Mon Sep 17 00:00:00 2001 From: Jonny Bolton Date: Thu, 16 Jun 2022 18:27:10 +0100 Subject: [PATCH 1/2] maintainers: add jonnybolton --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 691d95e31f53..6625d05e67db 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6303,6 +6303,12 @@ githubId = 1843676; name = "Jonathan Reeve"; }; + jonnybolton = { + email = "jonnybolton@gmail.com"; + github = "jonnybolton"; + githubId = 8580434; + name = "Jonny Bolton"; + }; jonringer = { email = "jonringer117@gmail.com"; matrix = "@jonringer:matrix.org"; From d6b6545c9b2f6491d822c07a5e9ef632f566c329 Mon Sep 17 00:00:00 2001 From: Jonny Bolton Date: Thu, 16 Jun 2022 18:27:30 +0100 Subject: [PATCH 2/2] sokol: init at unstable-2022-06-13 --- pkgs/development/libraries/sokol/default.nix | 35 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/sokol/default.nix diff --git a/pkgs/development/libraries/sokol/default.nix b/pkgs/development/libraries/sokol/default.nix new file mode 100644 index 000000000000..daf1509e5852 --- /dev/null +++ b/pkgs/development/libraries/sokol/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "sokol"; + version = "unstable-2022-06-13"; + + src = fetchFromGitHub { + owner = "floooh"; + repo = "sokol"; + rev = "3c7016105f3b7463f0cfc74df8a55642e5448c11"; + sha256 = "sha256-dKHb6GTp5aJPuWWXI4ZYnhgdXs23gGWyPymGPGwxcLY="; + }; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include/sokol + cp *.h $out/include/sokol/ + cp -R util $out/include/sokol/util + + runHook postInstall + ''; + + meta = with lib; { + description = "Minimal cross-platform standalone C headers"; + homepage = "https://github.com/floooh/sokol"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ jonnybolton ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53048ee6ad2..07c13697fe17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20741,6 +20741,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; + sokol = callPackage ../development/libraries/sokol { }; + sonic = callPackage ../development/libraries/sonic { }; sope = callPackage ../development/libraries/sope { };