JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thunderbolt: 0.9.2 -> 0.9.3 (#42743)

Browse Source 
* thunderbolt: 0.9.2 -> 0.9.3

Fixed up `cmakeFlags` so `tbtacl`, `tbtacl-write`, `tbtxdomain`, and
the udev rules now show up in the derivation output. Previously there
was only `tbtadm`.

* Add a note about placeholder expressions
This commit is contained in:
Benjamin Staffin 2018-06-30 13:18:31 -04:00 committed by GitHub
parent 9fa8a9af36
commit 97ec194ab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/linux/thunderbolt/default.nix
View File

@ -4,16 +4,17 @@
, fetchFromGitHub , fetchFromGitHub
, pkgconfig , pkgconfig
, txt2tags , txt2tags
, udev
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "thunderbolt-${version}"; name = "thunderbolt-${version}";
version = "0.9.2"; version = "0.9.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "01org"; owner = "01org";
repo = "thunderbolt-software-user-space"; repo = "thunderbolt-software-user-space";
rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23"; rev = "v${version}";
sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc"; sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
}; };
buildInputs = [ buildInputs = [
@ -23,11 +24,15 @@ stdenv.mkDerivation rec {
txt2tags txt2tags
]; ];
cmakeFlags = [ # These can't go in the normal nix cmakeFlags because $out needs to be
"-DCMAKE_BUILD_TYPE='Release'" # expanded by the shell, not by cmake or nix. $ENV{out} doesn't work right
"-DUDEV_BIN_DIR=$out/bin" # either; it results in /build/source/build//nix/store/blahblahblahblah/bin/
"-DUDEV_RULES_DIR=$out/udev" # TODO: use ${placeholder "out"} when possible.
]; # See https://github.com/NixOS/nixpkgs/pull/37693
preConfigure = ''
cmakeFlags+=" -DUDEV_BIN_DIR=$out/bin"
cmakeFlags+=" -DUDEV_RULES_DIR=$out/etc/udev/rules.d"
'';
meta = { meta = {
description = "Thunderbolt(TM) user-space components"; description = "Thunderbolt(TM) user-space components";