Skip to content

mandelbulber: 2.32 -> 2.33, cleanup/add tests #417971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbsds merged 2 commits into from
Jun 24, 2025
Merged

mandelbulber: 2.32 -> 2.33, cleanup/add tests #417971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf6f62
mandelbulber: 2.32 -> 2.33
mdaniels5757 Jun 18, 2025
fff79c3
mandelbulber: cleanup/add tests
mdaniels5757 Jun 22, 2025
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
27 changes: 21 additions & 6 deletions pkgs/applications/graphics/mandelbulber/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
lib,
stdenv,
fetchFromGitHub,
runCommand,
writableTmpDirAsHomeHook,
nix-update-script,
libpng,
gsl,
libsndfile,
Expand All @@ -15,15 +18,15 @@
assert withOpenCL -> opencl-clhpp != null;
assert withOpenCL -> ocl-icd != null;

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "mandelbulber";
version = "2.32";
version = "2.33";

src = fetchFromGitHub {
owner = "buddhi1980";
repo = "mandelbulber2";
rev = version;
sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE=";
rev = finalAttrs.version;
sha256 = "sha256-3PPgH9E+k2DFm8ib1bmvTsllQ9kYi3oLDwPHcs1Otac=";
};

nativeBuildInputs = [
Expand All @@ -45,13 +48,25 @@ stdenv.mkDerivation rec {
ocl-icd
];

sourceRoot = "${src.name}/mandelbulber2";
sourceRoot = "${finalAttrs.src.name}/mandelbulber2";

qmakeFlags = [
"SHARED_PATH=${placeholder "out"}"
(if withOpenCL then "qmake/mandelbulber-opencl.pro" else "qmake/mandelbulber.pro")
];

passthru = {
tests = {
test = runCommand "mandelbulber2-test" {
nativeBuildInputs = [
finalAttrs.finalPackage
writableTmpDirAsHomeHook
];
} "mandelbulber2 --test && touch $out";
};
updateScript = nix-update-script { };
};

meta = with lib; {
description = "3D fractal rendering engine";
mainProgram = "mandelbulber2";
Expand All @@ -61,4 +76,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
maintainers = with maintainers; [ kovirobi ];
};
}
})
Loading