diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-08-03 17:49:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 17:49:01 -0400 |
| commit | 7a337cde318020a0f91702bfefee85a7b31be06f (patch) | |
| tree | c49f254cfc7923c8f60b589449ea0dc11e1fa694 /pkgs/applications/graphics | |
| parent | 8c784998f64da2d4c388f40a03f6604c8a2e0b45 (diff) | |
| parent | 3e034bac1ae1db6ded4eaae0de5153302e683ca5 (diff) | |
Merge pull request #44423 from obsidiansystems/configureFlags-cleanup
treewide: All configureFlags are lists
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/dia/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/xara/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 949dce7132bea..4780c823697a8 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough ''; - configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; + configureFlags = stdenv.lib.optional withGNOME "--enable-gnome"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 4542de2d42fac..56388a8a2555a 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - configureFlags = "--disable-svnversion"; + configureFlags = [ "--disable-svnversion" ]; patches = map fetchurl (import ./debian-patches.nix); |