diff options
author | Benjamin Staffin <benley@gmail.com> | 2018-06-30 13:18:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-30 13:18:31 -0400 |
commit | 97ec194ab5f46bef6356c7198530bf1f314a11c8 (patch) | |
tree | 6f81f76ae56513a991dc4bed4120aa61f5bd0435 /pkgs | |
parent | 9fa8a9af364e8baa70f7db430bf6b58905c74b82 (diff) |
thunderbolt: 0.9.2 -> 0.9.3 (#42743)
* 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
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/thunderbolt/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index 3189872ca3bca..9d919aaaa938a 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -4,16 +4,17 @@ , fetchFromGitHub , pkgconfig , txt2tags +, udev }: stdenv.mkDerivation rec { name = "thunderbolt-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "01org"; repo = "thunderbolt-software-user-space"; - rev = "1ae06410180320a5d0e7408a8d1a6ae2aa443c23"; - sha256 = "03yk419gj0767lpk6zvla4jx3nx56zsg4x4adl4nd50xhn409rcc"; + rev = "v${version}"; + sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; }; buildInputs = [ @@ -23,11 +24,15 @@ stdenv.mkDerivation rec { txt2tags ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='Release'" - "-DUDEV_BIN_DIR=$out/bin" - "-DUDEV_RULES_DIR=$out/udev" - ]; + # These can't go in the normal nix cmakeFlags because $out needs to be + # expanded by the shell, not by cmake or nix. $ENV{out} doesn't work right + # either; it results in /build/source/build//nix/store/blahblahblahblah/bin/ + # 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 = { description = "Thunderbolt(TM) user-space components"; |