Loading pkgs/applications/graphics/inkscape/default.nix +2 −8 Original line number Diff line number Diff line Loading @@ -74,11 +74,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; version = "1.4"; version = "1.4.1"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be Loading @@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; patches = [ (fetchpatch { # fix typo in gobjectptr member function. remove on update name = "gobjectptr-fix-member-name.patch"; url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; }) (replaceVars ./fix-python-paths.patch { # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. Loading pkgs/applications/graphics/openboard/default.nix +10 −47 Original line number Diff line number Diff line Loading @@ -2,8 +2,8 @@ stdenv, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, cmake, pkg-config, qmake, qtbase, qtxmlpatterns, Loading Loading @@ -65,20 +65,20 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' substituteInPlace OpenBoard.pro \ --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' ''; # Required by Poppler cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ]; nativeBuildInputs = [ qmake copyDesktopItems cmake pkg-config wrapQtAppsHook ]; Loading Loading @@ -111,43 +111,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ importer ]; makeFlags = [ "release-install" ]; desktopItems = [ (makeDesktopItem { name = "OpenBoard"; exec = "OpenBoard %f"; icon = "OpenBoard"; comment = "OpenBoard, an interactive white board application"; desktopName = "OpenBoard"; mimeTypes = [ "application/ubz" ]; categories = [ "Education" ]; startupNotify = true; }) ]; installPhase = '' runHook preInstall lrelease OpenBoard.pro # Replicated release_scripts/linux/package.sh mkdir -p $out/opt/openboard/i18n cp -R resources/customizations build/linux/release/product/* $out/opt/openboard/ cp resources/i18n/*.qm $out/opt/openboard/i18n/ install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/ install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png runHook postInstall ''; dontWrapQtApps = true; postFixup = '' makeWrapper $out/opt/openboard/OpenBoard $out/bin/OpenBoard \ "''${qtWrapperArgs[@]}" ''; meta = with lib; { description = "Interactive whiteboard application"; homepage = "https://openboard.ch/"; Loading @@ -157,6 +120,6 @@ stdenv.mkDerivation (finalAttrs: { fufexan ]; platforms = platforms.linux; mainProgram = "OpenBoard"; mainProgram = "openboard"; }; }) pkgs/applications/kde/kitinerary.nix +1 −0 Original line number Diff line number Diff line Loading @@ -18,6 +18,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; broken = true; # doesn't build with latest Poppler }; nativeBuildInputs = [ extra-cmake-modules Loading pkgs/applications/office/libreoffice/default.nix +9 −2 Original line number Diff line number Diff line Loading @@ -343,6 +343,14 @@ stdenv.mkDerivation (finalAttrs: { # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch # Backport patch to fix build with Poppler 25.05 # FIXME: conditionalize/remove as upstream updates (fetchpatch2 { url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; includes = [ "sdext/*" ]; hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; }) ] ++ lib.optionals (lib.versionOlder version "24.8") [ (fetchpatch2 { Loading @@ -353,7 +361,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (variant == "collabora") [ ./fix-unpack-collabora.patch ./skip-broken-sentence-breaking-rules.patch ]; postPatch = '' Loading Loading @@ -613,7 +620,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-gtk3-kde5" ] ++ ( if variant == "fresh" then if variant == "fresh" || variant == "collabora" then [ "--with-system-rhino" "--with-rhino-jar=${rhino}/share/java/js.jar" Loading pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patchdeleted 100644 → 0 +0 −48 Original line number Diff line number Diff line This part caused build failures in Collabora. LibreOffice has just dropped the entire file some time ago. --- a/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 --- b/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 @@ -88,41 +88,3 @@ [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend $Thai]{bof}] ($Extend | $Format | $Close | $Sp)* [^$Thai]; [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend]{bof}] ($Extend | $Format | $Close | $Sp)* ([$Sep{eof}] | $CR $LF){100}; -## ------------------------------------------------- - -!!reverse; - -$SpEx_R = ($Extend | $Format)* $Sp; -$ATermEx_R = ($Extend | $Format)* $ATerm; -$STermEx_R = ($Extend | $Format)* $STerm; -$CloseEx_R = ($Extend | $Format)* $Close; - -# -# Reverse rules. -# For now, use the old style inexact reverse rules, which are easier -# to write, but less efficient. -# TODO: exact reverse rules. It appears that exact reverse rules -# may require improving support for look-ahead breaks in the -# builder. Needs more investigation. -# - -[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*; -#.*; - -# Explanation for this rule: -# -# It needs to back over -# The $Sep at which we probably begin -# All of the non $Sep chars leading to the preceding $Sep -# The preceding $Sep, which will be the second one that the rule matches. -# Any immediately preceding STerm or ATerm sequences. We need to see these -# to get the correct rule status when moving forwards again. -# -# [{bof}] inhibit rule chaining. Without this, rule would loop on itself and match -# the entire string. -# -# (.? | $LF $CR) Match one $Sep instance. Use .? rather than $Sep because position might be -# at the beginning of the string at this point, and we don't want to fail. -# Can only use {eof} once, and it is used later. -# - Loading
pkgs/applications/graphics/inkscape/default.nix +2 −8 Original line number Diff line number Diff line Loading @@ -74,11 +74,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; version = "1.4"; version = "1.4.1"; src = fetchurl { url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; sha256 = "sha256-dHlqivThSg1dXBzFjT7B6m1IigQwbdbo0ywR8HSNcjI="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be Loading @@ -88,12 +88,6 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; patches = [ (fetchpatch { # fix typo in gobjectptr member function. remove on update name = "gobjectptr-fix-member-name.patch"; url = "https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch"; hash = "sha256-FvbJV/YrBwhHg0kFdbhyd/Y9g7YV2nPIrRqZt7yJ50Q="; }) (replaceVars ./fix-python-paths.patch { # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. Loading
pkgs/applications/graphics/openboard/default.nix +10 −47 Original line number Diff line number Diff line Loading @@ -2,8 +2,8 @@ stdenv, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, cmake, pkg-config, qmake, qtbase, qtxmlpatterns, Loading Loading @@ -65,20 +65,20 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' substituteInPlace OpenBoard.pro \ --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' ''; # Required by Poppler cmakeFlags = [ "-DCMAKE_CXX_STANDARD=20" ]; nativeBuildInputs = [ qmake copyDesktopItems cmake pkg-config wrapQtAppsHook ]; Loading Loading @@ -111,43 +111,6 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ importer ]; makeFlags = [ "release-install" ]; desktopItems = [ (makeDesktopItem { name = "OpenBoard"; exec = "OpenBoard %f"; icon = "OpenBoard"; comment = "OpenBoard, an interactive white board application"; desktopName = "OpenBoard"; mimeTypes = [ "application/ubz" ]; categories = [ "Education" ]; startupNotify = true; }) ]; installPhase = '' runHook preInstall lrelease OpenBoard.pro # Replicated release_scripts/linux/package.sh mkdir -p $out/opt/openboard/i18n cp -R resources/customizations build/linux/release/product/* $out/opt/openboard/ cp resources/i18n/*.qm $out/opt/openboard/i18n/ install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/ install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png runHook postInstall ''; dontWrapQtApps = true; postFixup = '' makeWrapper $out/opt/openboard/OpenBoard $out/bin/OpenBoard \ "''${qtWrapperArgs[@]}" ''; meta = with lib; { description = "Interactive whiteboard application"; homepage = "https://openboard.ch/"; Loading @@ -157,6 +120,6 @@ stdenv.mkDerivation (finalAttrs: { fufexan ]; platforms = platforms.linux; mainProgram = "OpenBoard"; mainProgram = "openboard"; }; })
pkgs/applications/kde/kitinerary.nix +1 −0 Original line number Diff line number Diff line Loading @@ -18,6 +18,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; broken = true; # doesn't build with latest Poppler }; nativeBuildInputs = [ extra-cmake-modules Loading
pkgs/applications/office/libreoffice/default.nix +9 −2 Original line number Diff line number Diff line Loading @@ -343,6 +343,14 @@ stdenv.mkDerivation (finalAttrs: { # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch # Backport patch to fix build with Poppler 25.05 # FIXME: conditionalize/remove as upstream updates (fetchpatch2 { url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch"; includes = [ "sdext/*" ]; hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA="; }) ] ++ lib.optionals (lib.versionOlder version "24.8") [ (fetchpatch2 { Loading @@ -353,7 +361,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (variant == "collabora") [ ./fix-unpack-collabora.patch ./skip-broken-sentence-breaking-rules.patch ]; postPatch = '' Loading Loading @@ -613,7 +620,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-gtk3-kde5" ] ++ ( if variant == "fresh" then if variant == "fresh" || variant == "collabora" then [ "--with-system-rhino" "--with-rhino-jar=${rhino}/share/java/js.jar" Loading
pkgs/applications/office/libreoffice/skip-broken-sentence-breaking-rules.patchdeleted 100644 → 0 +0 −48 Original line number Diff line number Diff line This part caused build failures in Collabora. LibreOffice has just dropped the entire file some time ago. --- a/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 --- b/i18npool/source/breakiterator/data/sent.txt 1970-01-01 01:00:01.000000000 +0100 @@ -88,41 +88,3 @@ [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend $Thai]{bof}] ($Extend | $Format | $Close | $Sp)* [^$Thai]; [[^$STerm $ATerm $Close $Sp $Sep $Format $Extend]{bof}] ($Extend | $Format | $Close | $Sp)* ([$Sep{eof}] | $CR $LF){100}; -## ------------------------------------------------- - -!!reverse; - -$SpEx_R = ($Extend | $Format)* $Sp; -$ATermEx_R = ($Extend | $Format)* $ATerm; -$STermEx_R = ($Extend | $Format)* $STerm; -$CloseEx_R = ($Extend | $Format)* $Close; - -# -# Reverse rules. -# For now, use the old style inexact reverse rules, which are easier -# to write, but less efficient. -# TODO: exact reverse rules. It appears that exact reverse rules -# may require improving support for look-ahead breaks in the -# builder. Needs more investigation. -# - -[{bof}] (.? | $LF $CR) [^$Sep]* [$Sep {eof}] ($SpEx_R* $CloseEx_R* ($STermEx_R | $ATermEx_R))*; -#.*; - -# Explanation for this rule: -# -# It needs to back over -# The $Sep at which we probably begin -# All of the non $Sep chars leading to the preceding $Sep -# The preceding $Sep, which will be the second one that the rule matches. -# Any immediately preceding STerm or ATerm sequences. We need to see these -# to get the correct rule status when moving forwards again. -# -# [{bof}] inhibit rule chaining. Without this, rule would loop on itself and match -# the entire string. -# -# (.? | $LF $CR) Match one $Sep instance. Use .? rather than $Sep because position might be -# at the beginning of the string at this point, and we don't want to fail. -# Can only use {eof} once, and it is used later. -# -