diff options
| author | Rodney Lorrimar <dev@rodney.id.au> | 2018-10-15 13:17:12 +1000 |
|---|---|---|
| committer | Rodney Lorrimar <dev@rodney.id.au> | 2018-10-28 14:33:37 +1000 |
| commit | 95fab6a09c4fd42eb9f69b9abd554735117dadd0 (patch) | |
| tree | f3026b2d4bdd2b809870274161d0dd1ea8ee72a5 /pkgs/os-specific/linux/bpftrace/bcc-source.patch | |
| parent | 0a7e258012b60cbe530a756f09a4f2516786d370 (diff) | |
| download | nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.tar nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.tar.gz nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.tar.bz2 nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.tar.lz nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.tar.xz nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.tar.zst nixpkgs-95fab6a09c4fd42eb9f69b9abd554735117dadd0.zip | |
linuxPackages.bpftrace: init at unstable-2018-10-27
Diffstat (limited to 'pkgs/os-specific/linux/bpftrace/bcc-source.patch')
| -rw-r--r-- | pkgs/os-specific/linux/bpftrace/bcc-source.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/bpftrace/bcc-source.patch b/pkgs/os-specific/linux/bpftrace/bcc-source.patch new file mode 100644 index 00000000000..a4c9947f0c3 --- /dev/null +++ b/pkgs/os-specific/linux/bpftrace/bcc-source.patch @@ -0,0 +1,32 @@ +From fc0a5bd2ddb5827c5288ee284c1f2d834d79e432 Mon Sep 17 00:00:00 2001 +From: Rodney Lorrimar <dev@rodney.id.au> +Date: Tue, 16 Oct 2018 09:55:59 +1000 +Subject: [PATCH 1/3] Don't use ExternalProject for bcc sources + +--- + CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eae850a..b20fb33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,6 +31,15 @@ if (OFFLINE_BUILDS) + UPDATE_DISCONNECTED 1 + BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static + ) ++elseif (NIX_BUILDS) ++ include(ExternalProject) ++ ExternalProject_Add(bcc ++ DOWNLOAD_COMMAND rmdir bcc && ln -sf $ENV{bccSrc} bcc ++ STEP_TARGETS build update ++ EXCLUDE_FROM_ALL 1 ++ UPDATE_DISCONNECTED 1 ++ BUILD_COMMAND ${CMAKE_COMMAND} --build . --target bcc-static ++ ) + else() + include(ExternalProject) + ExternalProject_Add(bcc +-- +2.17.1 + |