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

Merge pull request #49495 from dtzWill/fix/thunderbolt-cleanup

Browse Source 
thunderbolt: cleanup
This commit is contained in:
Will Dietz 2018-11-02 04:04:13 -05:00 committed by GitHub
commit 467a822ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 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

@ -16,22 +16,13 @@ stdenv.mkDerivation rec {
sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x";
}; };
buildInputs = [ nativeBuildInputs = [ cmake pkgconfig txt2tags ];
boost buildInputs = [ boost ];
cmake
pkgconfig
txt2tags
];
# These can't go in the normal nix cmakeFlags because $out needs to be cmakeFlags = [
# expanded by the shell, not by cmake or nix. $ENV{out} doesn't work right "-DUDEV_BIN_DIR=${placeholder "out"}/bin"
# either; it results in /build/source/build//nix/store/blahblahblahblah/bin/ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
# 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";