Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a61290dd37ab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47ad7d313135
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Aug 5, 2019

  1. lua*Packages.cqueues: fixup darwin build

    @vcunat
    vcunat committed Aug 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    47ad7d3 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/development/lua-modules/overrides.nix
4 changes: 4 additions & 0 deletions pkgs/development/lua-modules/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -40,6 +40,10 @@ with super;
{ name = "CRYPTO"; dep = pkgs.openssl; }
{ name = "OPENSSL"; dep = pkgs.openssl; }
];

# https://github.com/wahern/cqueues/issues/227
NIX_CFLAGS_COMPILE = if pkgs.stdenv.hostPlatform.isDarwin then [ "-DCLOCK_MONOTONIC" "-DCLOCK_REALTIME" ] else null;

disabled = luaOlder "5.1" || luaAtLeast "5.4";
# Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
# version, which doesn't work well for us, so modify it