From a4d94971582d1087ce1c7aa212e60d318911ccfc Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Wed, 29 Nov 2023 14:45:21 +0100 Subject: [PATCH] fix(ds-fr): Add patches --- machines/compute01/ds-fr/package/default.nix | 6 ++++++ .../ds-fr/package/patches/uninterlace_png.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 machines/compute01/ds-fr/package/patches/uninterlace_png.patch diff --git a/machines/compute01/ds-fr/package/default.nix b/machines/compute01/ds-fr/package/default.nix index 3cd079a..40279dc 100644 --- a/machines/compute01/ds-fr/package/default.nix +++ b/machines/compute01/ds-fr/package/default.nix @@ -94,6 +94,11 @@ let id = "bc4742aaacb174a55a08baae5f354ada3fba4577"; hash = "sha256-LShcRzj/lnFQyJtc9+RxNQq8tsCcdYrwhe2BjqLr1pQ="; } + # correction des svg des logos DGNum et DN + { + id = "ee474712a3e50d186acd8bbb52f60c1e4fee2f81"; + hash = "sha256-yoPCZOPPOk84n2oAISzjzJ8n3eWtsYqPglayRKcJGII="; + } ]; in stdenv.mkDerivation { @@ -109,6 +114,7 @@ in stdenv.mkDerivation { ./patches/smtp_settings.patch ./patches/garage.patch ./patches/secrets-fc.patch + ./patches/uninterlace_png.patch ] ++ dgn-patches; buildPhase = '' diff --git a/machines/compute01/ds-fr/package/patches/uninterlace_png.patch b/machines/compute01/ds-fr/package/patches/uninterlace_png.patch new file mode 100644 index 0000000..e3d7ed3 --- /dev/null +++ b/machines/compute01/ds-fr/package/patches/uninterlace_png.patch @@ -0,0 +1,12 @@ +diff --git a/app/controllers/concerns/uninterlace_png_concern.rb b/app/controllers/concerns/uninterlace_png_concern.rb +index 8e9d06251..0870357c6 100644 +--- a/app/controllers/concerns/uninterlace_png_concern.rb ++++ b/app/controllers/concerns/uninterlace_png_concern.rb +@@ -14,6 +14,6 @@ module UninterlacePngConcern + + def interlaced?(png_path) + png = MiniMagick::Image.open(png_path) +- png.data["interlace"] != "None" ++ png.details["interlace"] != "None" + end + end