Merge pull request #33346 from ryantrinkle/init-thunderbolt

Init thunderbolt at 0.9.2
This commit is contained in:
Ryan Trinkle 2018-01-03 17:31:57 -05:00 committed by GitHub
commit e1e5860ab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 0 deletions

View File

@ -583,6 +583,7 @@
ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>"; ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>"; ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
ryantm = "Ryan Mulligan <ryan@ryantm.com>"; ryantm = "Ryan Mulligan <ryan@ryantm.com>";
ryantrinkle = "Ryan Trinkle <ryan.trinkle@gmail.com>";
rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>"; rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>";
rycee = "Robert Helgesson <robert@rycee.net>"; rycee = "Robert Helgesson <robert@rycee.net>";
ryneeverett = "Ryne Everett <ryneeverett@gmail.com>"; ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";

View File

@ -0,0 +1,39 @@
{ stdenv
, boost
, cmake
, fetchFromGitHub
, pkgconfig
, txt2tags
}:
stdenv.mkDerivation rec {
name = "thunderbolt-${version}";
version = "0.9.2";
src = fetchFromGitHub {
owner = "01org";
repo = "thunderbolt-software-user-space";
rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23";
sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc";
};
buildInputs = [
boost
cmake
pkgconfig
txt2tags
];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE='Release'"
"-DUDEV_BIN_DIR=$out/bin"
"-DUDEV_RULES_DIR=$out/udev"
];
meta = {
description = "Thunderbolt(TM) user-space components";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.ryantrinkle ];
homepage = https://01.org/thunderbolt-sw;
platforms = stdenv.lib.platforms.linux;
};
}

View File

@ -17147,6 +17147,8 @@ with pkgs;
enableGTK3 = true; enableGTK3 = true;
}; };
thunderbolt = callPackage ../os-specific/linux/thunderbolt {};
thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {
gconf = pkgs.gnome2.GConf; gconf = pkgs.gnome2.GConf;
inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome2) libgnome libgnomeui;