diff --git a/lib/licenses.nix b/lib/licenses.nix index 14d2149a5164..ce3c05bad007 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1444,8 +1444,8 @@ lib.mapAttrs mkLicense ( fullName = "Do What The F*ck You Want To Public License"; }; - wxWindows = { - spdxId = "wxWindows"; + wxWindowsException31 = { + spdxId = "WxWindows-exception-3.1"; fullName = "wxWindows Library Licence, Version 3.1"; }; diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index f158daa44913..d7b92718b6b2 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -35,6 +35,9 @@ python3Packages.buildPythonApplication rec { description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (client tools)"; homepage = "https://www.frida.re/"; maintainers = with lib.maintainers; [ s1341 ]; - license = lib.licenses.wxWindows; + license = with lib.licenses; [ + lgpl2Plus + wxWindowsException31 + ]; }; } diff --git a/pkgs/by-name/wx/wxGTK31/package.nix b/pkgs/by-name/wx/wxGTK31/package.nix index 0b2df7e44c33..a37d95ec4caa 100644 --- a/pkgs/by-name/wx/wxGTK31/package.nix +++ b/pkgs/by-name/wx/wxGTK31/package.nix @@ -126,7 +126,10 @@ stdenv.mkDerivation rec { multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more. ''; - license = licenses.wxWindows; + license = with licenses; [ + lgpl2Plus + wxWindowsException31 + ]; maintainers = with maintainers; [ tfmoraes ]; platforms = platforms.unix; }; diff --git a/pkgs/by-name/wx/wxGTK32/package.nix b/pkgs/by-name/wx/wxGTK32/package.nix index b3021bcf15bb..4161416ce89b 100644 --- a/pkgs/by-name/wx/wxGTK32/package.nix +++ b/pkgs/by-name/wx/wxGTK32/package.nix @@ -147,7 +147,10 @@ stdenv.mkDerivation rec { multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more. ''; - license = licenses.wxWindows; + license = with licenses; [ + lgpl2Plus + wxWindowsException31 + ]; maintainers = with maintainers; [ tfmoraes fliegendewurst diff --git a/pkgs/by-name/wx/wxc/package.nix b/pkgs/by-name/wx/wxc/package.nix index e7c2f0e9e5f3..7fd72baa53b0 100644 --- a/pkgs/by-name/wx/wxc/package.nix +++ b/pkgs/by-name/wx/wxc/package.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C language binding for wxWidgets"; homepage = "https://wiki.haskell.org/WxHaskell"; - license = lib.licenses.wxWindows; + license = with lib.licenses; [ + lgpl2Plus + wxWindowsException31 + ]; maintainers = with lib.maintainers; [ fgaz ]; platforms = wxGTK32.meta.platforms; }; diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index 8da1ac6fa22e..05ebb6a946a9 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -127,7 +127,10 @@ stdenv.mkDerivation (finalAttrs: { multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more. ''; - license = lib.licenses.wxWindows; + license = with lib.licenses; [ + lgpl2Plus + wxWindowsException31 + ]; maintainers = with lib.maintainers; [ tfmoraes fliegendewurst diff --git a/pkgs/development/python-modules/frida-python/default.nix b/pkgs/development/python-modules/frida-python/default.nix index 2c3c82fab78f..292d3f751ba8 100644 --- a/pkgs/development/python-modules/frida-python/default.nix +++ b/pkgs/development/python-modules/frida-python/default.nix @@ -52,7 +52,10 @@ buildPythonPackage { meta = { description = "Dynamic instrumentation toolkit for developers, reverse-engineers, and security researchers (Python bindings)"; homepage = "https://www.frida.re"; - license = lib.licenses.wxWindows; + license = with lib.licenses; [ + lgpl2Plus + wxWindowsException31 + ]; maintainers = with lib.maintainers; [ s1341 ]; platforms = [ "x86_64-linux" diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index d9d00c9a3c1a..a4bd7a8af2f1 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -136,7 +136,10 @@ buildPythonPackage rec { changelog = "https://github.com/wxWidgets/Phoenix/blob/wxPython-${version}/CHANGES.rst"; description = "Cross platform GUI toolkit for Python, Phoenix version"; homepage = "http://wxpython.org/"; - license = licenses.wxWindows; + license = with licenses; [ + lgpl2Plus + wxWindowsException31 + ]; maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index ea9025a0dd78..de9df296f208 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -65,7 +65,10 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = licenses.wxWindows; + license = with licenses; [ + lgpl2Plus + wxWindowsException31 + ]; platforms = platforms.linux; maintainers = [ ]; };