Skip to content
Open
Changes from all 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
14 changes: 11 additions & 3 deletions pkgs/by-name/im/imgui/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
vulkan-headers,
vulkan-loader,
imgui,
xorg,
wayland,

# NOTE: Not coming from vcpkg
IMGUI_LINK_GLVND ?
Expand Down Expand Up @@ -72,7 +74,7 @@ in

stdenv.mkDerivation rec {
pname = "imgui";
version = "1.91.4";
version = "1.92.3";
outputs = [
# Note: no "dev" because vcpkg installs include/ and imgui-config.cmake
# into different prefixes but expects the merged layout at import time
Expand All @@ -84,15 +86,21 @@ stdenv.mkDerivation rec {
owner = "ocornut";
repo = "imgui";
tag = "v${version}";
hash = "sha256-6j4keBOAzbBDsV0+R4zTNlsltxz2dJDGI43UIrHXDNM=";
hash = "sha256-J+h7jJ+4wqr6RivtzyTDMXKxFoGs7dQbzqdu51XgEbc=";
};

cmakeRules = "${vcpkgSource}/ports/imgui";
postPatch = ''
cp "$cmakeRules"/{CMakeLists.txt,*.cmake.in} ./
'';

nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
xorg.libX11
xorg.libXcursor
xorg.libXrandr
wayland
];
Comment on lines +97 to +103

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For some reason it failed to build glfw without adding as native deps xorg and wayland, this was not needed before and I have no idea why.

Huh, native specifically, not buildInputs? For wayland it could be wayland-scanner maybe, but the rest are supposed to be... just libraries?

Could I ask you to to publish the build logs for the failing version please? A gist e.g.

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.

Please move them to buildInputs


propagatedBuildInputs =
lib.optionals IMGUI_LINK_GLVND [ libGL ]
Expand Down
Loading