From f8160d8856f3f385a060b6324ed62a125b9833d2 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 2 Dec 2023 09:44:34 -0500 Subject: [PATCH] lxc: remove with lib --- pkgs/os-specific/linux/lxc/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index c09baefa7927..4192de0cfeab 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -6,7 +6,6 @@ , libcap ? null, systemd ? null }: -with lib; stdenv.mkDerivation rec { pname = "lxc"; version = "4.0.12"; @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { "--disable-api-docs" "--with-init-script=none" "--with-distro=nixos" # just to be sure it is "unknown" - ] ++ optional (libapparmor != null) "--enable-apparmor" - ++ optional (libselinux != null) "--enable-selinux" - ++ optional (libseccomp != null) "--enable-seccomp" - ++ optional (libcap != null) "--enable-capabilities" + ] ++ lib.optional (libapparmor != null) "--enable-apparmor" + ++ lib.optional (libselinux != null) "--enable-selinux" + ++ lib.optional (libseccomp != null) "--enable-seccomp" + ++ lib.optional (libcap != null) "--enable-capabilities" ++ [ "--disable-examples" "--enable-python" @@ -90,7 +89,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; - license = licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; longDescription = '' LXC is the userspace control package for Linux Containers, a @@ -100,7 +99,7 @@ stdenv.mkDerivation rec { mechanisms to Linux’s existing process management infrastructure. ''; - platforms = platforms.linux; + platforms = lib.platforms.linux; maintainers = lib.teams.lxc.members; }; }