diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-04 18:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-04 18:01:05 +0000 |
| commit | 3af9469ebd9f79d0adbdf77d11f18e2a58a2b1ea (patch) | |
| tree | d0bfb5c96171570979ccf196c3bc9c36ec7b0728 /pkgs/misc | |
| parent | f45fe3273b03fb407954c6951264939aeabd9ac3 (diff) | |
| parent | b122db5e7611d73cdf54d11d9c4d0e301b9ba48b (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/brightnessctl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/lilypond/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 2fab8b4bd676c..43a37ad764eeb 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ megheaiulian ]; platforms = platforms.linux; + mainProgram = "brightnessctl"; }; } diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index ef861068fa496..b9f59934efea1 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2 , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils boehmgc rsync ]; |