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/development/libraries/zeroc-ice | |
| parent | 1d87f9866c857b72f60eb6c9f7f4701a38ac2136 (diff) | |
| download | nixpkgs-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar nixpkgs-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.gz nixpkgs-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.bz2 nixpkgs-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.lz nixpkgs-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.xz nixpkgs-8f94a33b38fdd8b5e1c3e57303855364887ec332.tar.zst nixpkgs-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/development/libraries/zeroc-ice')
| -rw-r--r-- | pkgs/development/libraries/zeroc-ice/3.6.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/zeroc-ice/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index 896973e32eb..725af51487c 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sourceRoot=$sourceRoot/cpp ''; - prePatch = lib.optional stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace config/Make.rules.Darwin \ --replace xcrun "" ''; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index ef16e381bcf..f522c181039 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; - prePatch = lib.optional stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace Make.rules.Darwin \ --replace xcrun "" ''; |