Unverified Commit 010bfaa1 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents ead01ee5 04691f35

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -9556,6 +9556,12 @@ 
    githubId = 127353;

    name = "Geoffrey Huntley";

  };

  gibbert = {

    email = "gbjgms@gmail.com";

    github = "zgibberish";

    githubId = 67570424;

    name = "gibbert";

  };

  gigahawk = {

    email = "Jasper Chan";

    name = "jasperchan515@gmail.com";

pkgs/applications/audio/mmlgui/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
  pkg-config,

  glfw,

  libvgm,

  libX11,

  libXau,

  libXdmcp,

  libx11,

  libxau,

  libxdmcp,

  cppunit,

}:
@@ -55,9 +55,9 @@ stdenv.mkDerivation { 
    libvgm

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

    libX11

    libXau

    libXdmcp

    libx11

    libxau

    libxdmcp

  ];



  checkInputs = [

pkgs/applications/audio/open-music-kontrollers/generic.nix

+4 −4
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
  ninja,

  lv2,

  sord,

  libX11,

  libXext,

  libx11,

  libxext,

  glew,

  lv2lint,

  pname,
@@ -40,8 +40,8 @@ stdenv.mkDerivation { 
  buildInputs = [

    lv2

    sord

    libX11

    libXext

    libx11

    libxext

    glew

    lv2lint

  ]

pkgs/applications/audio/rakarrack/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
  alsa-utils,

  fltk,

  libjack2,

  libXft,

  libXpm,

  libxft,

  libxpm,

  libjpeg,

  libpng,

  libsamplerate,
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec { 
    alsa-utils

    fltk

    libjack2

    libXft

    libXpm

    libxft

    libxpm

    libjpeg

    libpng

    libsamplerate

pkgs/applications/audio/zynaddsubfx/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
  fltk,

  libGL,

  libjpeg,

  libX11,

  libXpm,

  libx11,

  libxpm,

  ntk,



  # Test dependencies
@@ -116,16 +116,16 @@ stdenv.mkDerivation rec { 
  ++ lib.optionals (guiModule == "fltk") [

    fltk

    libjpeg

    libXpm

    libxpm

  ]

  ++ lib.optionals (guiModule == "ntk") [

    ntk

    cairo

    libXpm

    libxpm

  ]

  ++ lib.optionals (guiModule == "zest") [

    libGL

    libX11

    libx11

  ];



  cmakeFlags = [