From 903906cea4d00e21957ef38b31aeb400a2670467 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 16 Sep 2024 12:22:08 -0400 Subject: [PATCH 1/3] openboard: replace -> replace-fail --- pkgs/applications/graphics/openboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 363114fdaafb..4c7ad13946c9 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -52,9 +52,9 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ - --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace-fail '-lquazip5' '-lquazip1-qt5' \ + --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; From 7e45c9e19035e8459b9c961ce5a48300b858925b Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 16 Sep 2024 12:23:04 -0400 Subject: [PATCH 2/3] openboard: disable software updates by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing with Nix means updating won’t work this way anyway, and disabling also hopefully means reduced telemetry. This also hides the action to manually check from the dropdown menu. --- pkgs/applications/graphics/openboard/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 4c7ad13946c9..9bf830a2302a 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -55,6 +55,11 @@ in stdenv.mkDerivation (finalAttrs: { --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ --replace-fail '-lquazip5' '-lquazip1-qt5' \ --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + + substituteInPlace resources/etc/OpenBoard.config \ + --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'EnableSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'HideCheckForSoftwareUpdate=false' 'HideCheckForSoftwareUpdate=true' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; From 7cad243b71619174fd6d102b498d0d8932a3a884 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 16 Sep 2024 12:32:39 -0400 Subject: [PATCH 3/3] openboard: 1.7.0 -> 1.7.1 Diff: https://github.com/OpenBoard-org/OpenBoard/compare/v1.7.0...v1.7.1 --- pkgs/applications/graphics/openboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 9bf830a2302a..a02ae20d9f03 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -25,13 +25,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; rev = "v${finalAttrs.version}"; - hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; + hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM="; }; patches = [