diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f02920bb1911a..681e222b762c1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20599,6 +20599,12 @@ githubId = 121009904; name = "penalty1083"; }; + peng0in = { + matrix = "@peng0in:skyoasis.de"; + github = "JulHee"; + githubId = 9954356; + name = "peng0in"; + }; pentane = { email = "cyclopentane@aidoskyneen.eu"; github = "cyclic-pentane"; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index d68826a630091..411c24b05e953 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, cmake, libarcus, - stb, + stb_2023, protobuf, fetchpatch, }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libarcus - stb + stb_2023 protobuf ]; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index 8c2e8e005ebdc..f9583533d6bb6 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -41,7 +41,7 @@ libinput, glslang, hwdata, - stb, + stb_2023, wlroots_0_17, libdecor, lcms, @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "enable_gamescope_wsi_layer" enableWsi) (lib.mesonOption "glm_include_dir" "${lib.getInclude glm}/include") - (lib.mesonOption "stb_include_dir" "${lib.getInclude stb}/include/stb") + (lib.mesonOption "stb_include_dir" "${lib.getInclude stb_2023}/include/stb") ]; # don't install vendored vkroots etc diff --git a/pkgs/by-name/st/stb/package.nix b/pkgs/by-name/st/stb/package.nix index 3283dcc11f175..f417d31eeb0a7 100644 --- a/pkgs/by-name/st/stb/package.nix +++ b/pkgs/by-name/st/stb/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stb"; - version = "0-unstable-2023-01-29"; + version = "0-unstable-2025-10-26"; src = fetchFromGitHub { owner = "nothings"; repo = "stb"; - rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9"; - hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98="; + rev = "f1c79c02822848a9bed4315b12c8c8f3761e1296"; + hash = "sha256-BlyXJtAI7WqXCTT3ylww8zoG0hBxaojJnQDvdQOXJPE="; }; nativeBuildInputs = [ copyPkgconfigItems ]; @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: { unlicense ]; platforms = lib.platforms.all; - maintainers = [ ]; + maintainers = with lib.maintainers; [ peng0in ]; }; }) diff --git a/pkgs/by-name/st/stb_2023/package.nix b/pkgs/by-name/st/stb_2023/package.nix new file mode 100644 index 0000000000000..3283dcc11f175 --- /dev/null +++ b/pkgs/by-name/st/stb_2023/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + copyPkgconfigItems, + makePkgconfigItem, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "stb"; + version = "0-unstable-2023-01-29"; + + src = fetchFromGitHub { + owner = "nothings"; + repo = "stb"; + rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9"; + hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98="; + }; + + nativeBuildInputs = [ copyPkgconfigItems ]; + + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "stb"; + version = "1"; + cflags = [ "-I${variables.includedir}/stb" ]; + variables = rec { + prefix = "${placeholder "out"}"; + includedir = "${prefix}/include"; + }; + inherit (finalAttrs.meta) description; + }) + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/include/stb + cp *.h $out/include/stb/ + cp *.c $out/include/stb/ + runHook postInstall + ''; + + meta = { + description = "Single-file public domain libraries for C/C++"; + homepage = "https://github.com/nothings/stb"; + license = with lib.licenses; [ + mit + # OR + unlicense + ]; + platforms = lib.platforms.all; + maintainers = [ ]; + }; +})