Skip to content

treewide: replace ImageMagick 7 deprecated convert command with magick #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trueNAHO wants to merge 1 commit into
base: master
Choose a base branch
from
Open

treewide: replace ImageMagick 7 deprecated convert command with magick #2336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/src/tricks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let
in
{
stylix.image = pkgs.runCommand "dimmed-background.png" { } ''
${lib.getExe' pkgs.imagemagick "convert"} "${inputImage}" -brightness-contrast ${brightness},${contrast} -fill ${fillColor} $out
${lib.getExe' pkgs.imagemagick "magick"} "${inputImage}" -brightness-contrast ${brightness},${contrast} -fill ${fillColor} $out
'';
}
```
Expand Down
2 changes: 1 addition & 1 deletion modules/grub/nixos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ in
# Make sure the background image is .png by asking to convert it
then
''
${lib.getExe' pkgs.imagemagick "convert"} \
${lib.getExe' pkgs.imagemagick "magick"} \
${lib.escapeShellArg config.stylix.image} \
"png32:$out/background.png"
''
Expand Down
2 changes: 1 addition & 1 deletion modules/plymouth/nixos.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ mkTarget {
themeDir="$out/share/plymouth/themes/stylix"
mkdir -p $themeDir

${lib.getExe' pkgs.imagemagick "convert"} \
${lib.getExe' pkgs.imagemagick "magick"} \
-background transparent \
-bordercolor transparent \
${
Expand Down
2 changes: 1 addition & 1 deletion modules/wayfire/hm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ mkTarget {
{ image, imageScalingMode }:
let
wayfireBackground = pkgs.runCommand "wayfire-background.png" { } ''
${lib.getExe' pkgs.imagemagick "convert"} ${image} $out
${lib.getExe' pkgs.imagemagick "magick"} ${image} $out
'';
in
{
Expand Down
2 changes: 1 addition & 1 deletion stylix/pixel.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
color:
pkgs.runCommand "${color}-pixel.png" {
color = config.lib.stylix.colors.withHashtag.${color};
} "${lib.getExe' pkgs.imagemagick "convert"} xc:$color png32:$out";
} "${lib.getExe' pkgs.imagemagick "magick"} xc:$color png32:$out";
}
Loading