From 0b74a12120d8ae332af1b8a5996553744eb8dd87 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 10:23:33 -0700 Subject: [PATCH] gwyddion: remove with statements --- .../science/chemistry/gwyddion/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index b7f06898504f..9e64ee7afe4d 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -24,19 +24,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file ]; - buildInputs = with lib; - [ gtk2 fftw ] ++ - optionals openglSupport [ gnome2.gtkglext libGL ] ++ - optional openexrSupport openexr ++ - optional libXmuSupport xorg.libXmu ++ - optional fitsSupport cfitsio ++ - optional libpngSupport libpng ++ - optional libxsltSupport libxslt ++ - optional libxml2Support libxml2 ++ - optional libwebpSupport libwebp ++ - optional zlibSupport zlib ++ - optional libuniqueSupport libunique ++ - optional libzipSupport libzip; + buildInputs = [ gtk2 fftw ] ++ + lib.optionals openglSupport [ gnome2.gtkglext libGL ] ++ + lib.optional openexrSupport openexr ++ + lib.optional libXmuSupport xorg.libXmu ++ + lib.optional fitsSupport cfitsio ++ + lib.optional libpngSupport libpng ++ + lib.optional libxsltSupport libxslt ++ + lib.optional libxml2Support libxml2 ++ + lib.optional libwebpSupport libwebp ++ + lib.optional zlibSupport zlib ++ + lib.optional libuniqueSupport libunique ++ + lib.optional libzipSupport libzip; # This patch corrects problems with python support, but should apply cleanly # regardless of whether python support is enabled, and have no effects if