diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-01 17:44:55 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-09-02 20:14:22 +1000 |
| commit | ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d (patch) | |
| tree | 113c0b0a2e462ae33f32fc54718d36db8148d481 /pkgs | |
| parent | c5dcb9682ebb7b586601beb65267a9241df156f8 (diff) | |
| download | nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.tar nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.tar.gz nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.tar.bz2 nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.tar.lz nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.tar.xz nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.tar.zst nixpkgs-ee0d559dae1bd2bdf3591b3efc5ce832ebbf2b1d.zip | |
oci-seccomp-bpf-hook: move to linuxPackages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix (renamed from pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix) | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 0e97a7c3646..3247e8c4eda 100644 --- a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -3,9 +3,9 @@ , fetchFromGitHub , go-md2man , installShellFiles -, libseccomp -, linuxPackages , pkg-config +, bcc +, libseccomp }: buildGoModule rec { @@ -27,8 +27,8 @@ buildGoModule rec { pkg-config ]; buildInputs = [ + bcc libseccomp - linuxPackages.bcc ]; buildPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f99911a8621..b7f9053ca1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17782,6 +17782,8 @@ in netatop = callPackage ../os-specific/linux/netatop { }; + oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -24872,8 +24874,6 @@ in nxengine-evo = callPackage ../games/nxengine-evo { }; - oci-seccomp-bpf-hook = callPackage ../applications/virtualization/oci-seccomp-bpf-hook { }; - odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; |