From 83d7cb0bbc5869741d35df2bc44ead825892da28 Mon Sep 17 00:00:00 2001 From: Serhii Khoma Date: Sun, 17 Mar 2019 22:26:08 +0200 Subject: [PATCH] image_optim: refactor --- pkgs/applications/graphics/image_optim/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index d4ac2ac8a2f6..d7f05381c62e 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -27,8 +27,7 @@ assert withSvgo -> svgo != null; with lib; let - optionalDepsPath = makeBinPath ( - [] + optionalDepsPath = [] ++ optional withPngcrush pngcrush ++ optional withPngout pngout ++ optional withAdvpng advancecomp @@ -39,8 +38,7 @@ let ++ optional withJpegrecompress jpeg-archive ++ optional withJpegtran libjpeg ++ optional withGifsicle gifsicle - ++ optional withSvgo svgo - ); + ++ optional withSvgo svgo; in bundlerApp { @@ -55,7 +53,7 @@ bundlerApp { postBuild = '' wrapProgram $out/bin/image_optim \ - --prefix PATH : ${optionalDepsPath} + --prefix PATH : ${makeBinPath optionalDepsPath} ''; meta = with lib; {