diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-17 07:01:38 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-17 07:01:38 -0700 |
| commit | c227fb4b17469864298087f8c9367e4cfc8dd6b9 (patch) | |
| tree | 6f4db8017a8bd3975d257c5f35e637caa39c6a2b /pkgs/development/libraries/libical | |
| parent | 3ff6965554e6daedca27cf6a87d35cbbbec4afb7 (diff) | |
| parent | 631cbc3de7aaf244d322111ada656e0bedf55bff (diff) | |
| download | nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.gz nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.bz2 nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.lz nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.xz nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.tar.zst nixpkgs-c227fb4b17469864298087f8c9367e4cfc8dd6b9.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/tools/rust/cargo-cache/default.nix pkgs/development/tools/rust/cargo-embed/default.nix pkgs/development/tools/rust/cargo-flash/default.nix pkgs/servers/nosql/influxdb2/default.nix
Diffstat (limited to 'pkgs/development/libraries/libical')
| -rw-r--r-- | pkgs/development/libraries/libical/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 92fb23f4527..909ee73e69a 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -12,13 +12,12 @@ , libical , python3 , tzdata +, fixDarwinDylibNames , introspectionSupport ? stdenv.buildPlatform == stdenv.hostPlatform -, gobject-introspection ? null -, vala ? null +, gobject-introspection +, vala }: -assert introspectionSupport -> gobject-introspection != null && vala != null; - stdenv.mkDerivation rec { pname = "libical"; version = "3.0.10"; @@ -47,6 +46,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals introspectionSupport [ gobject-introspection vala + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; installCheckInputs = [ # running libical-glib tests @@ -80,6 +81,13 @@ stdenv.mkDerivation rec { # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables doInstallCheck = true; enableParallelChecking = false; + preInstallCheck = if stdenv.isDarwin then '' + for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do + for lib in $(cd lib && ls *.3.dylib); do + install_name_tool -change $lib $out/lib/$lib $testexe + done + done + '' else null; installCheckPhase = '' runHook preInstallCheck |