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/lame/default.nix | |
| 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/lame/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lame/default.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix index 674defc42e2a..bdc173507c05 100644 --- a/nixpkgs/pkgs/development/libraries/lame/default.nix +++ b/nixpkgs/pkgs/development/libraries/lame/default.nix @@ -11,7 +11,6 @@ , debugSupport ? false # Debugging (disables optimizations) }: -with lib; stdenv.mkDerivation rec { pname = "lame"; version = "3.100"; @@ -25,25 +24,25 @@ stdenv.mkDerivation rec { outputMan = "out"; nativeBuildInputs = [ ] - ++ optional nasmSupport nasm; + ++ lib.optional nasmSupport nasm; buildInputs = [ ] #++ optional efenceSupport libefence #++ optional mp3xSupport gtk1 - ++ optional sndfileFileIOSupport libsndfile; + ++ lib.optional sndfileFileIOSupport libsndfile; configureFlags = [ - (enableFeature nasmSupport "nasm") - (enableFeature cpmlSupport "cpml") + (lib.enableFeature nasmSupport "nasm") + (lib.enableFeature cpmlSupport "cpml") #(enableFeature efenceSupport "efence") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (enableFeature analyzerHooksSupport "analyzer-hooks") - (enableFeature decoderSupport "decoder") - (enableFeature frontendSupport "frontend") - (enableFeature frontendSupport "dynamic-frontends") + (lib.enableFeature analyzerHooksSupport "analyzer-hooks") + (lib.enableFeature decoderSupport "decoder") + (lib.enableFeature frontendSupport "frontend") + (lib.enableFeature frontendSupport "dynamic-frontends") #(enableFeature mp3xSupport "mp3x") - (enableFeature mp3rtpSupport "mp3rtp") - (if debugSupport then "--enable-debug=alot" else "") + (lib.enableFeature mp3rtpSupport "mp3rtp") + (lib.optionalString debugSupport "--enable-debug=alot") ]; preConfigure = '' @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { sed -i '/lame_init_old/d' include/libmp3lame.sym ''; - meta = { + meta = with lib; { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; |