diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/faac | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/faac')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/faac/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/faac/default.nix b/nixpkgs/pkgs/development/libraries/faac/default.nix index dbc56572d537..42f1f8db59bb 100644 --- a/nixpkgs/pkgs/development/libraries/faac/default.nix +++ b/nixpkgs/pkgs/development/libraries/faac/default.nix @@ -5,7 +5,6 @@ assert mp4v2Support -> (mp4v2 != null); -with lib; stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; @@ -16,19 +15,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ ] - ++ optional mp4v2Support "--with-external-mp4v2" - ++ optional drmSupport "--enable-drm"; + ++ lib.optional mp4v2Support "--with-external-mp4v2" + ++ lib.optional drmSupport "--enable-drm"; hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ] - ++ optional mp4v2Support mp4v2; + ++ lib.optional mp4v2Support mp4v2; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; |