···1{ config, pkgs, lib, ... }:
23-with lib;
0000000045{
6 imports = [
7 (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
0000000000008 ];
910 meta = {
···3233 gtkUsePortal = mkOption {
34 type = types.bool;
035 default = false;
36 description = ''
37 Sets environment variable <literal>GTK_USE_PORTAL</literal> to <literal>1</literal>.
38- This is needed for packages ran outside Flatpak to respect and use XDG Desktop Portals.
39- For example, you'd need to set this for non-flatpak Firefox to use native filechoosers.
40 Defaults to <literal>false</literal> to respect its opt-in nature.
41 '';
42 };
···1{ config, pkgs, lib, ... }:
23+let
4+ inherit (lib)
5+ mkEnableOption
6+ mkIf
7+ mkOption
8+ mkRenamedOptionModule
9+ teams
10+ types;
11+in
1213{
14 imports = [
15 (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ])
16+17+ ({ config, lib, options, ... }:
18+ let
19+ from = [ "xdg" "portal" "gtkUsePortal" ];
20+ fromOpt = lib.getAttrFromPath from options;
21+ in
22+ {
23+ warnings = lib.mkIf config.xdg.portal.gtkUsePortal [
24+ "The option `${lib.showOption from}' defined in ${lib.showFiles fromOpt.files} has been deprecated. Setting the variable globally with `environment.sessionVariables' NixOS option can have unforseen side-effects."
25+ ];
26+ }
27+ )
28 ];
2930 meta = {
···5253 gtkUsePortal = mkOption {
54 type = types.bool;
55+ visible = false;
56 default = false;
57 description = ''
58 Sets environment variable <literal>GTK_USE_PORTAL</literal> to <literal>1</literal>.
59+ This will force GTK-based programs ran outside Flatpak to respect and use XDG Desktop Portals
60+ for features like file chooser but it is an unsupported hack that can easily break things.
61 Defaults to <literal>false</literal> to respect its opt-in nature.
62 '';
63 };
···8182 # Using install check so we do not have to manually set
83 # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables
84- doInstallCheck = true;
085 enableParallelChecking = false;
86 preInstallCheck = if stdenv.isDarwin then ''
87 for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do
···8182 # Using install check so we do not have to manually set
83 # LD_LIBRARY_PATH and GI_TYPELIB_PATH variables
84+ # Musl does not support TZDIR.
85+ doInstallCheck = !stdenv.hostPlatform.isMusl;
86 enableParallelChecking = false;
87 preInstallCheck = if stdenv.isDarwin then ''
88 for testexe in $(find ./src/test -maxdepth 1 -type f -executable); do
···2, buildPythonPackage
3, pythonOlder
4, fetchFromGitHub
5-, black
6, jinja2
7, poetry-core
8, round
···38 patches = [
39 # The build-system section is missing
40 ./build_poetry.patch
041 ];
4243 checkInputs = [ pytestCheckHook ];
4445 # Despite living in 'tool.poetry.dependencies',
46 # these are only used at build time to process the image resource files
47- nativeBuildInputs = [ black inkscape imagemagick jinja2 poetry-core round ];
4849 propagatedBuildInputs = [ graphviz ];
50
···2, buildPythonPackage
3, pythonOlder
4, fetchFromGitHub
05, jinja2
6, poetry-core
7, round
···37 patches = [
38 # The build-system section is missing
39 ./build_poetry.patch
40+ ./remove-black-requirement.patch
41 ];
4243 checkInputs = [ pytestCheckHook ];
4445 # Despite living in 'tool.poetry.dependencies',
46 # these are only used at build time to process the image resource files
47+ nativeBuildInputs = [ inkscape imagemagick jinja2 poetry-core round ];
4849 propagatedBuildInputs = [ graphviz ];
50
···59 } // attrs.meta;
60 });
6162+ format = buildHaxeLib {
63+ libname = "format";
64+ version = "3.5.0";
65+ sha256 = "sha256-5vZ7b+P74uGx0Gb7X/+jbsx5048dO/jv5nqCDtw5y/A=";
66+ meta.description = "A Haxe Library for supporting different file formats";
67+ };
68+69+ heaps = buildHaxeLib {
70+ libname = "heaps";
71+ version = "1.9.1";
72+ sha256 = "sha256-i5EIKnph80eEEHvGXDXhIL4t4+RW7OcUV5zb2f3ItlI=";
73+ meta.description = "The GPU Game Framework";
74+ };
75+76+ hlopenal = buildHaxeLib {
77+ libname = "hlopenal";
78+ version = "1.5.0";
79+ sha256 = "sha256-mJWFGBJPPAhVwsB2HzMfk4szSyjMT4aw543YhVqIan4=";
80+ meta.description = "OpenAL support for Haxe/HL";
81+ };
82+83+ hlsdl = buildHaxeLib {
84+ libname = "hlsdl";
85+ version = "1.10.0";
86+ sha256 = "sha256-kmC2EMDy1mv0jFjwDj+m0CUvKal3V7uIGnMxJBRYGms=";
87+ meta.description = "SDL/GL support for Haxe/HL";
88+ };
89+90 hxcpp = buildHaxeLib rec {
91 libname = "hxcpp";
92 version = "4.1.15";
+8-4
pkgs/top-level/linux-kernels.nix
···196 ];
197 };
198199- linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix {
0000200 kernelPatches = [
201 kernelPatches.bridge_stp_helper
202 kernelPatches.request_key_helper
203 ];
204- };
205206- linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix {
207 kernelPatches = [
208 kernelPatches.bridge_stp_helper
209 kernelPatches.request_key_helper
210 ];
211- };
212213 # This contains both the STABLE and EDGE variants of the XanMod kernel
214 xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix;
···196 ];
197 };
198199+ # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
200+ # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
201+ zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;
202+203+ linux_zen = (zenKernels {
204 kernelPatches = [
205 kernelPatches.bridge_stp_helper
206 kernelPatches.request_key_helper
207 ];
208+ }).zen;
209210+ linux_lqx = (zenKernels {
211 kernelPatches = [
212 kernelPatches.bridge_stp_helper
213 kernelPatches.request_key_helper
214 ];
215+ }).lqx;
216217 # This contains both the STABLE and EDGE variants of the XanMod kernel
218 xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix;