pahole: remove submodule
1.22 merged the EMBEDDED_LIBBPF patch back
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchgit, cmake, elfutils, zlib }:
|
||||
{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pahole";
|
||||
@@ -7,14 +7,13 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-U1/i9WNlLphPIcNysC476sqil/q9tMYmu+Y6psga8I0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ elfutils zlib ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ elfutils zlib libbpf ];
|
||||
|
||||
# Put libraries in "lib" subdirectory, not top level of $out
|
||||
cmakeFlags = [ "-D__LIB=lib" ];
|
||||
cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://git.kernel.org/cgit/devel/pahole/pahole.git/";
|
||||
@@ -22,6 +21,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2Only;
|
||||
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.bosu ];
|
||||
maintainers = with maintainers; [ bosu martinetd ];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user