diff options
author | Shawn8901 <shawn8901@googlemail.com> | 2023-01-24 17:29:20 +0100 |
---|---|---|
committer | Shawn8901 <shawn8901@googlemail.com> | 2023-01-24 17:29:20 +0100 |
commit | 0a1dd3ced1d7a0d7d611c9f64e02fa9cd3ba3c6d (patch) | |
tree | a55d636b68c5d8266e8b3de05a1bcbbf925e21c3 /pkgs/applications/networking/instant-messengers/bitlbee | |
parent | c0aeb3305473e3a0df97785f562ea8707630e999 (diff) |
treewide: remove global with lib; in pkgs/{misc,networking}
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/bitlbee')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/bitlbee/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index de8c4dc1026e0..99ce3f8811ef3 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -3,7 +3,6 @@ , enablePam ? false, pam ? null }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee"; version = "3.6"; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ lib.optional doCheck check; buildInputs = [ gnutls libotr python3 ] - ++ optional enableLibPurple pidgin - ++ optional enablePam pam; + ++ lib.optional enableLibPurple pidgin + ++ lib.optional enablePam pam; propagatedBuildInputs = [ glib ]; @@ -25,8 +24,8 @@ stdenv.mkDerivation rec { "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ] ++ optional enableLibPurple "--purple=1" - ++ optional enablePam "--pam=1"; + ] ++ lib.optional enableLibPurple "--purple=1" + ++ lib.optional enablePam "--pam=1"; patches = [ # This should be dropped once the issue is fixed upstream. @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "IRC instant messaging gateway"; longDescription = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 997882bbc8bbf..f750f7f9d602b 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,7 +1,5 @@ { lib, runCommandLocal, bitlbee }: -with lib; - plugins: runCommandLocal "bitlbee-plugins" { inherit plugins; buildInputs = [ bitlbee plugins ]; |