From 274ea258ee704724977160757ac4228ecb6eb31f Mon Sep 17 00:00:00 2001 From: shelvacu <1731537+shelvacu@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:15:18 -0800 Subject: [PATCH] orca-slicer: Don't show update dialog by default (#378396) * orca-slicer: Don't show update dialog by default This pulls in https://github.com/SoftFever/OrcaSlicer/pull/7650 (which I wrote). The idea is, for the binaries that orca-slicer distributes from its github page, it might make sense to remind about updates because the user wouldn't otherwise know they need to take action to install new versions. But when orca-slicer is run using nix, we can safely assume the user will update using nix and they don't need the nag dialog. * Update pkgs/by-name/or/orca-slicer/package.nix --------- Co-authored-by: Shelvacu Co-authored-by: Sandro --- pkgs/by-name/or/orca-slicer/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix index faa025a797f0..96b996e4f38c 100644 --- a/pkgs/by-name/or/orca-slicer/package.nix +++ b/pkgs/by-name/or/orca-slicer/package.nix @@ -3,6 +3,7 @@ lib, binutils, fetchFromGitHub, + fetchpatch, cmake, pkg-config, wrapGAppsHook3, @@ -126,7 +127,15 @@ stdenv.mkDerivation rec { patches = [ # Fix for webkitgtk linking ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch + # Link opencv_core and opencv_imgproc instead of opencv_world ./patches/dont-link-opencv-world-orca.patch + # The changeset from https://github.com/SoftFever/OrcaSlicer/pull/7650, can be removed when that PR gets merged + # Allows disabling the update nag screen + (fetchpatch { + name = "pr-7650-configurable-update-check.patch"; + url = "https://github.com/SoftFever/OrcaSlicer/commit/d10a06ae11089cd1f63705e87f558e9392f7a167.patch"; + hash = "sha256-t4own5AwPsLYBsGA15id5IH1ngM0NSuWdFsrxMRXmTk="; + }) ]; doCheck = true; @@ -186,6 +195,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS=-DGL_SILENCE_DEPRECATION" "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-as-needed" "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${mesa.drivers}/lib -Wl,-rpath,${mesa.osmesa}/lib" + "-DORCA_VERSION_CHECK_DEFAULT=OFF" ]; preFixup = ''