From 6e68add23712c0004b421d82c9a1e4e5f9e7d8d3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 17 Nov 2024 14:44:32 +0800 Subject: [PATCH 1/3] pugl: init at 0-unstable-2024-10-06 --- pkgs/by-name/pu/pugl/package.nix | 65 ++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pkgs/by-name/pu/pugl/package.nix diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix new file mode 100644 index 000000000000..2af38bb31d1b --- /dev/null +++ b/pkgs/by-name/pu/pugl/package.nix @@ -0,0 +1,65 @@ +{ + stdenv, + lib, + meson, + fetchFromGitHub, + pkg-config, + xorg, + libGL, + cairo, + glslang, + python3, + doxygen, + vulkan-loader, + vulkan-headers, + sphinx, + sphinxygen, + ninja, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pugl"; + version = "0-unstable-2024-10-06"; + + src = fetchFromGitHub { + owner = "lv2"; + repo = "pugl"; + rev = "edd13c1b952b16633861855fcdbdd164e87b3c0a"; + hash = "sha256-s7uvA3F16VxJgaKlQWQP9rQtzzlD1NuebIgR5L3yHw4="; + }; + + postPatch = '' + patchShebangs . + ''; + + nativeBuildInputs = [ + meson + ninja + python3 + pkg-config + doxygen + glslang + sphinxygen + sphinx + python3.pkgs.sphinx-lv2-theme + ]; + + buildInputs = [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + libGL + vulkan-loader + vulkan-headers + xorg.libXext + cairo + ]; + + meta = { + homepage = "https://github.com/lv2/pugl"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + license = lib.licenses.isc; + description = "Minimal portable API for embeddable GUIs"; + }; +}) From f3f2f65e6343ba5e806733cc7e70750198bd799a Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sun, 17 Nov 2024 14:18:09 +0800 Subject: [PATCH 2/3] lvtk: 1.2.0 -> 1.2.0-unstable-2024-11-06 --- pkgs/by-name/lv/lvtk/package.nix | 67 +++++++++++++++++++------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index 54c76e5bc60c..fc5dacaba82d 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -1,43 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitHub, + boost, + gtkmm2, + lv2, + pkg-config, + python3, + meson, + pugl, + ninja, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lvtk"; - version = "1.2.0"; + version = "1.2.0-unstable-2024-11-06"; src = fetchFromGitHub { owner = "lvtk"; repo = "lvtk"; - rev = version; - sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; + rev = "0797fdcabef84f57b064c7b4507743afebc66589"; + hash = "sha256-Z79zy2/OZTO6RTrAqgTHTzB00LtFTFiJ272RvQRpbH8="; }; - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ boost gtkmm2 lv2 ]; + nativeBuildInputs = [ + pkg-config + python3 + meson + ninja + ]; + + buildInputs = [ + boost + gtkmm2 + lv2 + pugl + ]; enableParallelBuilding = true; - postPatch = '' - # Fix including the boost libraries during linking - sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build - - # don't use bundled waf - rm waf - - # remove (useless) python2 based print - sed -e '/print/d' -i wscript - ''; - - wafConfigureFlags = [ - "--boost-includes=${boost.dev}/include" - "--boost-libs=${boost.out}/lib" - ]; - - meta = with lib; { + meta = { description = "Set C++ wrappers around the LV2 C API"; mainProgram = "ttl2c"; homepage = "https://lvtk.org/"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + badPlatforms = [ + "x86_64-darwin" + "aarch64-darwin" + ]; }; -} +}) From a3e0c8cd6e931866171117a2bee17e38159d29fc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 23 Nov 2024 10:17:57 +0100 Subject: [PATCH 3/3] pugl: fix x86_64-darwin build --- pkgs/by-name/pu/pugl/package.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pu/pugl/package.nix b/pkgs/by-name/pu/pugl/package.nix index 2af38bb31d1b..4887bcad63eb 100644 --- a/pkgs/by-name/pu/pugl/package.nix +++ b/pkgs/by-name/pu/pugl/package.nix @@ -15,6 +15,7 @@ sphinx, sphinxygen, ninja, + apple-sdk_11, }: stdenv.mkDerivation (finalAttrs: { @@ -44,16 +45,20 @@ stdenv.mkDerivation (finalAttrs: { python3.pkgs.sphinx-lv2-theme ]; - buildInputs = [ - xorg.libX11 - xorg.libXcursor - xorg.libXrandr - libGL - vulkan-loader - vulkan-headers - xorg.libXext - cairo - ]; + buildInputs = + [ + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + libGL + vulkan-loader + vulkan-headers + xorg.libXext + cairo + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + ]; meta = { homepage = "https://github.com/lv2/pugl";