schmittlauch/nixos-seafile-overlay
1
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

libevhtp: fix build with oniguruma >= 6.95_rev1

Browse source
This commit is contained in:
Trolli Schmittlauch 2020-11-27 19:02:45 +01:00
parent 69cf92ddbe
commit 2787280d8c
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

@ -1,7 +1,10 @@
self: super: rec { 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 {}; 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 { python3Packages = super.python3Packages // rec {
jsonfield = super.python3Packages.callPackage ./jsonfield {}; jsonfield = super.python3Packages.callPackage ./jsonfield {};
django-simple-captcha = super.python3Packages.callPackage ./django-simple-captcha { inherit django-ranged-response; }; 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 {}; captcha = super.python3Packages.callPackage ./captcha {};
django-formtools = super.python3Packages.callPackage ./django-formtools {}; django-formtools = super.python3Packages.callPackage ./django-formtools {};
seafile-bindings = super.python3Packages.toPythonModule seafile-server.seafile-server-core; seafile-bindings = super.python3Packages.toPythonModule seafile-server.seafile-server-core;
ccnet-bindings = super.python3Packages.toPythonModule seafile-server.ccnet-server;
}; };
} }

3
libevhtp/default.nix
View file

@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libevent pth openssl ]; buildInputs = [ libevent pth openssl oniguruma ];
propagatedBuildInputs = [ oniguruma ];
# fix pkgconfig librarypath generation # fix pkgconfig librarypath generation
patches = [ ./pkgconfig-librarypath.patch ]; patches = [ ./pkgconfig-librarypath.patch ];
#cmakeFlags = [ "-DEVHTP_DISABLE_SSL=OFF" "-DEVHTP_BUILD_SHARED=ON" ]; #cmakeFlags = [ "-DEVHTP_DISABLE_SSL=OFF" "-DEVHTP_BUILD_SHARED=ON" ];