colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

overlays: split the pipewire ffado tweak into a preferences overlay

Browse Source
This commit is contained in:
Colin 2023-08-02 06:38:46 +00:00
parent cc09832187
commit b4c83987f9
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -174,6 +174,7 @@
disable-flakey-tests = final: prev: import ./overlays/disable-flakey-tests.nix final prev; disable-flakey-tests = final: prev: import ./overlays/disable-flakey-tests.nix final prev;
pkgs = final: prev: import ./overlays/pkgs.nix final prev; pkgs = final: prev: import ./overlays/pkgs.nix final prev;
pins = final: prev: import ./overlays/pins.nix final prev; pins = final: prev: import ./overlays/pins.nix final prev;
preferences = final: prev: import ./overlays/preferences.nix final prev;
optimizations = final: prev: import ./overlays/optimizations.nix final prev; optimizations = final: prev: import ./overlays/optimizations.nix final prev;
passthru = final: prev: passthru = final: prev:
let let

2
overlays/all.nix
View File

@ -5,6 +5,7 @@
final: prev: final: prev:
let let
pkgs = import ./pkgs.nix; pkgs = import ./pkgs.nix;
preferences = import ./preferences.nix;
disable-flakey-tests = import ./disable-flakey-tests.nix; disable-flakey-tests = import ./disable-flakey-tests.nix;
optimizations = import ./optimizations.nix; optimizations = import ./optimizations.nix;
cross = import ./cross.nix; cross = import ./cross.nix;
@ -18,6 +19,7 @@ let
in in
renderOverlays [ renderOverlays [
pkgs pkgs
preferences
disable-flakey-tests disable-flakey-tests
(ifCross optimizations) (ifCross optimizations)
(ifCross cross) (ifCross cross)

6
overlays/disable-flakey-tests.nix
View File

@ -50,12 +50,6 @@ in {
mesonFlags = [ "-Dtests=disabled" ]; mesonFlags = [ "-Dtests=disabled" ];
}) prev.libwacom; }) prev.libwacom;
pipewire = prev.pipewire.override {
# avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
# this means we lose firewire support (oh well..?)
ffadoSupport = false;
};
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(py-next: py-prev: { (py-next: py-prev: {
pyarrow = py-prev.pyarrow.overridePythonAttrs (upstream: { pyarrow = py-prev.pyarrow.overridePythonAttrs (upstream: {

10
overlays/preferences.nix Normal file
View File

@ -0,0 +1,10 @@
# personal preferences
# prefer to encode these in `sane.programs`
# resort to this method for e.g. system dependencies, or things which are referenced from too many places.
(next: prev: {
pipewire = prev.pipewire.override {
# avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
# this means we lose firewire support (oh well..?)
ffadoSupport = false;
};
})