Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/curaengine/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
fetchFromGitHub,
cmake,
libarcus,
stb,
stb_2023,
protobuf,
fetchpatch,
}:
Expand All @@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [
libarcus
stb
stb_2023
protobuf
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ga/gamescope/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
libinput,
glslang,
hwdata,
stb,
stb_2023,
wlroots_0_17,
libdecor,
lcms,
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/hy/hyperhdr/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
lunasvg,
nanopb,
linalg,
stb,
stb_2023,
}:

let
Expand Down Expand Up @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
qt6Packages.qtbase
qt6Packages.qtserialport
sdbus-cpp_2
stb
stb_2023
xz
];

Expand Down
6 changes: 3 additions & 3 deletions pkgs/by-name/im/imagelol/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
fetchpatch,
cmake,
libpng,
stb,
stb_2023,
}:

stdenv.mkDerivation (finalAttrs: {
Expand Down Expand Up @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {

# use system stb headers
substituteInPlace External/stb_image-cmake/CMakeLists.txt \
--replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/../stb"' '"${stb}/include/stb"'
--replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/../stb"' '"${stb_2023}/include/stb"'

# remove bundled libraries
rm -r External/zlib External/zlib-no-examples External/libpng External/stb
Expand All @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {

buildInputs = [
libpng
stb
stb_2023
];

installPhase = ''
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/lm/lms/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
zlib,
libsm,
libice,
stb,
stb_2023,
openssl,
xxHash,
pugixml,
Expand Down Expand Up @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
zlib
libsm
libice
stb
stb_2023
openssl
xxHash
pugixml
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/qo/qoi/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
lib,
libpng,
nix-update-script,
stb,
stb_2023,
stdenv,
testers,
}:
Expand Down Expand Up @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildOutputs = [ ];

makeFlags = [
"CFLAGS=-I${lib.getDev stb}/include/stb"
"CFLAGS=-I${lib.getDev stb_2023}/include/stb"
"PREFIX=${placeholder "dev"}"
"BINDIR=${placeholder "out"}/bin"
];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/sh/shadps4/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
renderdoc,
robin-map,
sndio,
stb,
stb_2023,
toml11,
util-linux,
vulkan-headers,
Expand Down Expand Up @@ -120,7 +120,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
renderdoc
robin-map
sndio
stb
stb_2023
toml11
util-linux
vulkan-headers
Expand Down
8 changes: 4 additions & 4 deletions pkgs/by-name/st/stb/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
Expand Down Expand Up @@ -51,6 +51,6 @@ stdenv.mkDerivation (finalAttrs: {
unlicense
];
platforms = lib.platforms.all;
maintainers = [ ];
maintainers = with lib.maintainers; [ peng0in ];
};
})
56 changes: 56 additions & 0 deletions pkgs/by-name/st/stb_2023/package.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
lib,
stdenv,
fetchFromGitHub,
copyPkgconfigItems,
makePkgconfigItem,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "stb_2023";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pname = "stb_2023";
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 = [ ];
};
})
6 changes: 3 additions & 3 deletions pkgs/by-name/su/supercell-wx/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
range-v3,
re2,
spdlog,
stb,
stb_2023,
zlib,
}:
let
Expand Down Expand Up @@ -111,7 +111,7 @@ buildStdenv.mkDerivation (finalAttrs: {

# These tests aren't built by 'all', but ctest still tries to run them.
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;'test_mln_core|test_mln_widgets'")
(lib.cmakeFeature "STB_INCLUDE_DIR" "${stb}/include/stb")
(lib.cmakeFeature "STB_INCLUDE_DIR" "${stb_2023}/include/stb")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TRACY" "${tracy.src}")
];

Expand Down Expand Up @@ -151,7 +151,7 @@ buildStdenv.mkDerivation (finalAttrs: {
re2
range-v3
spdlog
stb
stb_2023
zlib
];

Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ti/timg/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
librsvg,
cairo,
pkg-config,
stb,
stb_2023,
qoi,
stdenv,
}:
Expand Down Expand Up @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
librsvg
cairo
qoi.dev
stb
stb_2023
];

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ti/tinygltf/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# propagatedBuildInputs
nlohmann_json,
stb,
stb_2023,
}:

stdenv.mkDerivation (finalAttrs: {
Expand All @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {

propagatedBuildInputs = [
nlohmann_json
stb
stb_2023
];

cmakeFlags = [
Expand Down
Loading