diff --git a/default.nix b/default.nix index 9deb288..ceff8bb 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,10 @@ self: super: rec { - libevhtp = super.callPackage ./libevhtp/default.nix {}; + # TODO: modify oniguruma derivation instead, pass at callPackage stage + # Since onig-6.9.5_rev1 the POSIX API is disabled by default, causing the libevhtp build relying on it to fail + onigWithPosixAPI = super.oniguruma.overrideAttrs (oldAttrs: {configureFlags = [ "--enable-posix-api=yes" ];}); + libevhtp = super.callPackage ./libevhtp/default.nix {oniguruma = onigWithPosixAPI;}; libsearpc = super.callPackage ./libsearpc/default.nix {}; - seafile-server = super.callPackage ./seafile-server/default.nix { inherit libevhtp python3Packages libsearpc;}; + seafile-server = super.callPackage ./seafile-server/default.nix { inherit libevhtp python3Packages libsearpc; oniguruma = onigWithPosixAPI;}; python3Packages = super.python3Packages // rec { jsonfield = super.python3Packages.callPackage ./jsonfield {}; django-simple-captcha = super.python3Packages.callPackage ./django-simple-captcha { inherit django-ranged-response; }; @@ -11,6 +14,5 @@ self: super: rec { captcha = super.python3Packages.callPackage ./captcha {}; django-formtools = super.python3Packages.callPackage ./django-formtools {}; seafile-bindings = super.python3Packages.toPythonModule seafile-server.seafile-server-core; - ccnet-bindings = super.python3Packages.toPythonModule seafile-server.ccnet-server; }; } diff --git a/libevhtp/default.nix b/libevhtp/default.nix index e1a5dc6..45a2f92 100644 --- a/libevhtp/default.nix +++ b/libevhtp/default.nix @@ -16,8 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libevent pth openssl ]; - propagatedBuildInputs = [ oniguruma ]; + buildInputs = [ libevent pth openssl oniguruma ]; # fix pkgconfig librarypath generation patches = [ ./pkgconfig-librarypath.patch ]; #cmakeFlags = [ "-DEVHTP_DISABLE_SSL=OFF" "-DEVHTP_BUILD_SHARED=ON" ];