diff options
| author | makefu <github@syntax-fehler.de> | 2018-10-08 00:54:00 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-10-12 13:44:22 +0200 |
| commit | d74ea280d1cdd630642da22230b4eb9391392e03 (patch) | |
| tree | 447f9e9c4c148855331498578672377a1dcf4979 /pkgs/servers/uhub/default.nix | |
| parent | 92a77c32baa6c0f7cbb12213c27f8961bca9bb67 (diff) | |
| download | nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.tar nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.tar.gz nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.tar.bz2 nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.tar.lz nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.tar.xz nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.tar.zst nixpkgs-d74ea280d1cdd630642da22230b4eb9391392e03.zip | |
uhub: fix build for aarch64
related: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770175 related: https://github.com/janvidar/uhub/issues/46
Diffstat (limited to 'pkgs/servers/uhub/default.nix')
| -rw-r--r-- | pkgs/servers/uhub/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 456f73dc52e..52866784faa 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd +{ stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkgconfig, systemd , tlsSupport ? false }: assert tlsSupport -> openssl != null; @@ -31,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"; }) |