diff options
| author | makefu <github@syntax-fehler.de> | 2018-01-28 13:57:55 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-01-28 13:57:55 +0100 |
| commit | 7d30101dd3f4b6e1191e37ea6a81c1c33fa535de (patch) | |
| tree | 95d7ffe30c1c69bde0fb039737fc0af3f47d3c8a | |
| parent | cc51c5f7db21749b87b0db096087b7e7447a8f0a (diff) | |
Revert "ma hw/stk1160: rip"
This reverts commit 1cbc2e5aa359e7e9b4b32c9ef75902576347a6d0.
| -rw-r--r-- | makefu/1systems/x/config.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/hw/stk1160.nix | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 3686acb6..a32db91e 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -61,7 +61,7 @@ with import <stockholm/lib>; <stockholm/makefu/2configs/hw/tp-x230.nix> <stockholm/makefu/2configs/hw/rtl8812au.nix> <stockholm/makefu/2configs/hw/wwan.nix> - # <stockholm/makefu/2configs/hw/stk1160.nix> + <stockholm/makefu/2configs/hw/stk1160.nix> # <stockholm/makefu/2configs/rad1o.nix> # Filesystem @@ -86,6 +86,7 @@ with import <stockholm/lib>; nixpkgs.config.allowUnfree = true; + environment.systemPackages = [ pkgs.passwdqc-utils ]; # configure pulseAudio to provide a HDMI sink as well @@ -103,7 +104,4 @@ with import <stockholm/lib>; ''; # hard dependency because otherwise the device will not be unlocked boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; - - nix.package = pkgs.nixUnstable; - environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ]; } diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix new file mode 100644 index 00000000..b3a9e1a5 --- /dev/null +++ b/makefu/2configs/hw/stk1160.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: +{ + # TODO: un-pin linuxPackages somehow + boot.kernelPackages = builtins.trace "Warning: overriding kernel Packages with 4.9" pkgs.linuxPackages; + nixpkgs.config.packageOverrides = pkgs: { + linux_4_9 = pkgs.linux_4_9.override { + extraConfig = '' + MEDIA_ANALOG_TV_SUPPORT y + VIDEO_STK1160_COMMON m + VIDEO_STK1160_AC97 y + VIDEO_STK1160 m + ''; + }; + }; +} |