diff options
| author | Christian Kögler <ck3d@gmx.de> | 2018-04-23 23:54:04 +0200 |
|---|---|---|
| committer | Christian Kögler <ck3d@gmx.de> | 2018-04-24 00:12:44 +0200 |
| commit | 884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8 (patch) | |
| tree | 1814afc4efcc0dd64d4b09d4452dc97b43d26b48 | |
| parent | 9cbf81e11b12e3799fe35b039d93caead6083ba2 (diff) | |
| download | nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.tar nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.tar.gz nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.tar.bz2 nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.tar.lz nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.tar.xz nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.tar.zst nixpkgs-884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8.zip | |
tbs: updated to kernel-4.14
* updated meta data * fix concurrent names for fetchFromGitHub derivations
| -rw-r--r-- | pkgs/os-specific/linux/tbs/default.nix | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index e4b954d4dbf..db20a7ab821 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }: +{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }: let - media = fetchFromGitHub { + + media = fetchFromGitHub rec { + name = repo; owner = "tbsdtv"; repo = "linux_media"; - rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4"; - sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h"; + rev = "efe31531b77efd3a4c94516504a5823d31cdc776"; + sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr"; }; - build = fetchFromGitHub { + + build = fetchFromGitHub rec { + name = repo; owner = "tbsdtv"; repo = "media_build"; - rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05"; - sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl"; + rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b"; + sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4"; }; + in stdenv.mkDerivation { - name = "tbs-2017-11-05-${kernel.version}"; + name = "tbs-2018.04.18-${kernel.version}"; srcs = [ media build ]; sourceRoot = "${build.name}"; @@ -39,10 +44,13 @@ in stdenv.mkDerivation { installFlags = [ "DESTDIR=$(out)" ]; hardeningDisable = [ "pic" "format" ]; - nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]; - meta = with stdenv.lib; { + nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ] + ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ]; + + meta = with lib; { homepage = https://www.tbsdtv.com/; + description = "Linux driver for TBSDTV cards"; license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; priority = 20; |