diff options
| author | Sebastián Mancilla <smancill@smancill.dev> | 2021-08-17 20:14:20 -0400 |
|---|---|---|
| committer | Sebastián Mancilla <smancill@smancill.dev> | 2021-08-20 19:08:42 -0400 |
| commit | 8f94a33b38fdd8b5e1c3e57303855364887ec332 (patch) | |
| tree | b2482923cda2bb402fdde538e52dd021bf728d60 /pkgs/applications/science | |
| parent | 1d87f9866c857b72f60eb6c9f7f4701a38ac2136 (diff) | |
| download | nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.gz nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.bz2 nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.lz nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.xz nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.zst nixlib-8f94a33b38fdd8b5e1c3e57303855364887ec332.zip | |
treewide: ensure pre/post phase hooks are strings
Some derivations use lib.optional or lib.optionals when setting pre/post phase hooks. Ensure the proper lib.optionalString is used.
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/biology/neuron/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/kicad/base.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/physics/sherpa/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 7bfef3a82fed..804407968e1c 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -60,13 +60,13 @@ stdenv.mkDerivation rec { else ["--without-mpi"]); - postInstall = lib.optionals (python != null) [ '' + postInstall = lib.optionalString (python != null) '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then mkdir -p ''${out}/${python.sitePackages} mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ fi - '']; + ''; propagatedBuildInputs = [ readline ncurses which libtool ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 596083c27098..d7398f39ec43 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -64,7 +64,7 @@ assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; let - inherit (lib) optional optionals; + inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "kicad-base"; @@ -172,7 +172,7 @@ stdenv.mkDerivation rec { dontStrip = debug; - postInstall = optional (withI18n) '' + postInstall = optionalString (withI18n) '' mkdir -p $out/share lndir ${i18n}/share $out/share ''; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index ba519cc2d032..eb718be12e4a 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4"; }; - postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") '' + postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; |