Unverified Commit 820257e5 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

[Backport release-25.11] libxinerama: resolve license todo (#464872)

parents f7437c5e 98a85d16

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -1520,6 +1520,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "X11 License";

    };



    x11NoPermitPersons = {

      spdxId = "X11-no-permit-persons";

      fullName = "X11 no permit persons clause";

    };



    xerox = {

      spdxId = "Xerox";

      fullName = "Xerox License";

pkgs/by-name/li/libxinerama/package.nix

+1 −4
Original line number Diff line number Diff line
@@ -57,10 +57,7 @@ stdenv.mkDerivation (finalAttrs: { 
    license = with lib.licenses; [

      mit

      mitOpenGroup

      # TODO: change this to a new license depending on if this

      # https://github.com/spdx/license-list-XML/issues/2831

      # actually creates a new license or just new markup for X11

      x11

      x11NoPermitPersons

    ];

    maintainers = [ ];

    pkgConfigModules = [ "xinerama" ];