Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

thunderbolt: cleanup

+6 -15
+6 -15
pkgs/os-specific/linux/thunderbolt/default.nix
··· 16 16 sha256 = "02w1bfm7xvq0dzkhwqiq0camkzz9kvciyhnsis61c8vzp39cwx0x"; 17 17 }; 18 18 19 - buildInputs = [ 20 - boost 21 - cmake 22 - pkgconfig 23 - txt2tags 19 + nativeBuildInputs = [ cmake pkgconfig txt2tags ]; 20 + buildInputs = [ boost ]; 21 + 22 + cmakeFlags = [ 23 + "-DUDEV_BIN_DIR=${placeholder "out"}/bin" 24 + "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" 24 25 ]; 25 - 26 - # These can't go in the normal nix cmakeFlags because $out needs to be 27 - # expanded by the shell, not by cmake or nix. $ENV{out} doesn't work right 28 - # either; it results in /build/source/build//nix/store/blahblahblahblah/bin/ 29 - # TODO: use ${placeholder "out"} when possible. 30 - # See https://github.com/NixOS/nixpkgs/pull/37693 31 - preConfigure = '' 32 - cmakeFlags+=" -DUDEV_BIN_DIR=$out/bin" 33 - cmakeFlags+=" -DUDEV_RULES_DIR=$out/etc/udev/rules.d" 34 - ''; 35 26 36 27 meta = { 37 28 description = "Thunderbolt(TM) user-space components";