|
27 | 27 | systems.url = "github:nix-systems/default-linux"; |
28 | 28 | }; |
29 | 29 |
|
30 | | - outputs = { flake-parts, nixpkgs, nixpkgs-qt6, self, systems, ... }@inputs: |
| 30 | + outputs = |
| 31 | + { |
| 32 | + flake-parts, |
| 33 | + nixpkgs, |
| 34 | + nixpkgs-qt6, |
| 35 | + self, |
| 36 | + systems, |
| 37 | + ... |
| 38 | + }@inputs: |
31 | 39 | flake-parts.lib.mkFlake { inherit inputs; } { |
32 | 40 | imports = [ inputs.devenv.flakeModule ]; |
33 | 41 |
|
34 | 42 | systems = import systems; |
35 | 43 |
|
36 | | - perSystem = { config, pkgs, system, ... }: |
| 44 | + perSystem = |
| 45 | + { |
| 46 | + config, |
| 47 | + pkgs, |
| 48 | + system, |
| 49 | + ... |
| 50 | + }: |
37 | 51 | let |
38 | 52 | inherit (nixpkgs) lib; |
39 | 53 |
|
40 | 54 | qt6Pkgs = import nixpkgs-qt6 { inherit system; }; |
41 | 55 | in |
42 | 56 | { |
| 57 | + formatter = pkgs.nixfmt-rfc-style; |
| 58 | + |
43 | 59 | devenv.shells = rec { |
44 | 60 | default = tagstudio; |
45 | 61 |
|
|
68 | 84 | name = "TagStudio"; |
69 | 85 |
|
70 | 86 | # Derived from previous flake iteration. |
71 | | - packages = (with pkgs; [ |
72 | | - cmake |
73 | | - binutils |
74 | | - coreutils |
75 | | - dbus |
76 | | - fontconfig |
77 | | - freetype |
78 | | - gdb |
79 | | - glib |
80 | | - libGL |
81 | | - libGLU |
82 | | - libgcc |
83 | | - libxkbcommon |
84 | | - mypy |
85 | | - ruff |
86 | | - xorg.libxcb |
87 | | - zstd |
88 | | - ]) |
89 | | - ++ (with qt6Pkgs; [ |
90 | | - qt6.full |
91 | | - qt6.qtbase |
92 | | - qt6.qtwayland |
93 | | - qtcreator |
94 | | - ]); |
| 87 | + packages = |
| 88 | + (with pkgs; [ |
| 89 | + cmake |
| 90 | + binutils |
| 91 | + coreutils |
| 92 | + dbus |
| 93 | + fontconfig |
| 94 | + freetype |
| 95 | + gdb |
| 96 | + glib |
| 97 | + libGL |
| 98 | + libGLU |
| 99 | + libgcc |
| 100 | + libxkbcommon |
| 101 | + mypy |
| 102 | + ruff |
| 103 | + xorg.libxcb |
| 104 | + zstd |
| 105 | + ]) |
| 106 | + ++ (with qt6Pkgs; [ |
| 107 | + qt6.full |
| 108 | + qt6.qtbase |
| 109 | + qt6.qtwayland |
| 110 | + qtcreator |
| 111 | + ]); |
95 | 112 |
|
96 | 113 | enterShell = |
97 | 114 | let |
98 | | - setQtEnv = pkgs.runCommand "set-qt-env" |
99 | | - { |
100 | | - buildInputs = with qt6Pkgs.qt6; [ |
101 | | - qtbase |
102 | | - ]; |
103 | | - |
104 | | - nativeBuildInputs = (with pkgs; [ |
105 | | - makeShellWrapper |
106 | | - ]) |
107 | | - ++ (with qt6Pkgs.qt6; [ |
108 | | - wrapQtAppsHook |
109 | | - ]); |
110 | | - } |
111 | | - '' |
112 | | - makeShellWrapper "$(type -p sh)" "$out" "''${qtWrapperArgs[@]}" |
113 | | - sed "/^exec/d" -i "$out" |
114 | | - ''; |
| 115 | + setQtEnv = |
| 116 | + pkgs.runCommand "set-qt-env" |
| 117 | + { |
| 118 | + buildInputs = with qt6Pkgs.qt6; [ |
| 119 | + qtbase |
| 120 | + ]; |
| 121 | + |
| 122 | + nativeBuildInputs = |
| 123 | + (with pkgs; [ |
| 124 | + makeShellWrapper |
| 125 | + ]) |
| 126 | + ++ (with qt6Pkgs.qt6; [ |
| 127 | + wrapQtAppsHook |
| 128 | + ]); |
| 129 | + } |
| 130 | + '' |
| 131 | + makeShellWrapper "$(type -p sh)" "$out" "''${qtWrapperArgs[@]}" |
| 132 | + sed "/^exec/d" -i "$out" |
| 133 | + ''; |
115 | 134 | in |
116 | 135 | '' |
117 | 136 | source ${setQtEnv} |
|
162 | 181 | quiet = true; |
163 | 182 | requirements = |
164 | 183 | let |
165 | | - excludeDeps = req: deps: builtins.concatStringsSep "\n" |
166 | | - (builtins.filter (line: !(lib.any (elem: lib.hasPrefix elem line) deps)) |
167 | | - (lib.splitString "\n" req)); |
| 184 | + excludeDeps = |
| 185 | + req: deps: |
| 186 | + builtins.concatStringsSep "\n" ( |
| 187 | + builtins.filter (line: !(lib.any (elem: lib.hasPrefix elem line) deps)) (lib.splitString "\n" req) |
| 188 | + ); |
168 | 189 | in |
169 | 190 | '' |
170 | 191 | ${builtins.readFile ./requirements.txt} |
|
0 commit comments