diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/appleseed/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/asymptote/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/fim/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/gifsicle/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/base.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index d45c28528e72..cafe0bb7b11a 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { osl seexpr makeWrapper ]; - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = toString [ "-I${openexr.dev}/include/OpenEXR" "-I${ilmbase.dev}/include/OpenEXR" "-I${openimageio.dev}/include/OpenImageIO" diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 14b15686d720..31bdba26783e 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "--with-context=$out/share/texmf/tex/context/third" ]; - NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ]; + NIX_CFLAGS_COMPILE = "-I${boehmgc.dev}/include/gc"; postInstall = '' mv $out/share/info/asymptote/*.info $out/share/info/ diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 296ba43a5ed7..3fc82a9c72a0 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ optional jpegSupport libjpeg ++ optional pngSupport libpng; - NIX_CFLAGS_COMPILE = stdenv.lib.optional x11Support "-lSDL"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString x11Support "-lSDL"; meta = with stdenv.lib; { description = "A lightweight, highly customizable and scriptable image viewer"; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 79b2708cb2b7..9b3836b9decc 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -11,12 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"; }; - buildInputs = optional gifview [ xorgproto libXt libX11 ]; + buildInputs = optionals gifview [ xorgproto libXt libX11 ]; - configureFlags = [] - ++ optional (!gifview) [ "--disable-gifview" ]; + configureFlags = optional (!gifview) "--disable-gifview"; - LDFLAGS = optional static "-static"; + LDFLAGS = optionalString static "-static"; doCheck = true; checkPhase = '' diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 700bed237bdb..3b9d8a4cca5d 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" - ] ++ stdenv.lib.optional (xorg == null) [ "--without-x" ]; + ] ++ stdenv.lib.optional (xorg == null) "--without-x"; inherit patches; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 9a071e6150f9..7610b4e56fb0 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; # Disable assertions which include -dev QtBase file paths. - NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG"; configureFlags = [ "--without-python" |