diff options
| author | Robin Gloster <mail@glob.in> | 2019-11-20 10:17:54 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 01:37:49 +0100 |
| commit | 6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e (patch) | |
| tree | f7e05e6509973953dedade1333c125ef65163fb2 /pkgs/tools/graphics | |
| parent | e9c27ed5f9494e1070ce4f1d5da14de1e9e072ac (diff) | |
| download | nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.gz nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.bz2 nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.lz nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.xz nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.tar.zst nixpkgs-6ca6ac796b2a5d1c5596463abdd93bc9b6cc003e.zip | |
treewide: configureFlags is a flat list
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/gifsicle/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/base.nix | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 79b2708cb2b..9b3836b9dec 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 700bed237bd..3b9d8a4cca5 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; |