Unverified Commit 274ea258 authored by shelvacu's avatar shelvacu Committed by GitHub
Browse files

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: default avatarShelvacu <git@shelvacu.com>
Co-authored-by: default avatarSandro <sandro.jaeckel@gmail.com>
parent 97cb30a6

pkgs/by-name/or/orca-slicer/package.nix

+10 −0
Original line number Diff line number Diff line
@@ -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 = ''