ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48021 from makefu/pkgs/uhub/enable-mod-auth-sqlite

Browse Source 
uhub: re-enable sqlite plugin / fix aarch64 build
This commit is contained in:
Silvan Mosberger 2018-10-17 17:54:02 +02:00 committed by GitHub
commit 4473d3d56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/servers/uhub/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd
{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd
, tlsSupport ? false }:
assert tlsSupport -> openssl != null;
@ -7,9 +7,11 @@ stdenv.mkDerivation rec {
name = "uhub-${version}";
version = "0.5.0";
src = fetchurl {
url = "https://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2";
sha256 = "1xcqjz20lxikzn96f4f69mqyl9y985h9g0gyc9f7ckj18q22b5j5";
src = fetchFromGitHub {
owner = "janvidar";
repo = "uhub";
rev = version;
sha256 = "0zdbxfvw7apmfhqgsfkfp4pn9iflzwdn0zwvzymm5inswfc00pxg";
};
nativeBuildInputs = [ pkgconfig ];
@ -20,6 +22,7 @@ stdenv.mkDerivation rec {
"mod_welcome"
"mod_logging"
"mod_auth_simple"
"mod_auth_sqlite"
"mod_chat_history"
"mod_chat_only"
"mod_topic"
@ -28,9 +31,14 @@ stdenv.mkDerivation rec {
patches = [
./plugin-dir.patch
# fix aarch64 build: https://github.com/janvidar/uhub/issues/46
(fetchpatch {
url = "https://github.com/janvidar/uhub/pull/47.patch";
sha256 = "07yik6za89ar5bxm7m2183i7f6hfbawbxvd4vs02n1zr2fgfxmiq";
})
# Fixed compilation on systemd > 210
(fetchurl {
(fetchpatch {
url = "https://github.com/janvidar/uhub/commit/70f2a43f676cdda5961950a8d9a21e12d34993f8.diff";
sha256 = "1jp8fvw6f9jh0sdjml9mahkk6p6b96p6rzg2y601mnnbcdj8y8xp";
})

2
pkgs/servers/uhub/plugin-dir.patch
View File

@ -7,7 +7,7 @@
- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_history_sqlite mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL )
- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL )
+
+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
+ set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads )
+
+ foreach( PLUGIN ${PLUGINS} )
+ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL )