rarias/nixos-riscv
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

base: update overlays and remove unnecessary patches

Browse Source
This commit is contained in:
matthewcroughan 2022-07-13 07:48:58 +01:00
parent dd384cd7d7
commit 89bbcf877b
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
base.nix
View File

@ -3,18 +3,34 @@
# Remove ZFS # Remove ZFS
boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" "ext4" "vfat" ]; boot.supportedFilesystems = lib.mkForce [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" "ext4" "vfat" ];
# Awaiting upstream linux-firmware patch # RISC-V Quirks and patches, should be upstreamed
# https://lore.kernel.org/all/CADWks+YJm8bi+KPXYTvQ3JrriDW2dcdxfSZ2O5J0vfhfC654Tw@mail.gmail.com/
# https://github.com/NixOS/nixpkgs/pull/168826#issuecomment-1152990386
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
linux-firmware = prev.linux-firmware.overrideAttrs (old: { gusb = prev.gusb.overrideAttrs (old: {
postInstall = '' buildInputs = old.buildInputs ++ [ prev.gobject-introspection ];
cp $out/lib/firmware/brcm/brcmfmac43430-sdio.AP6212.txt \
$out/lib/firmware/brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt
'';
outputHash = null;
}); });
colord = prev.colord.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ prev.gobject-introspection ];
});
cage = prev.cage.overrideAttrs (old: {
depsBuildBuild = [ prev.pkg-config ];
});
# ebook_tools = prev.ebook_tools.overrideAttrs (_old: {
# preConfigure = ''
# NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $($PKG_CONFIG --cflags libzip)"
# '';
# });
discount = prev.discount.overrideAttrs (_old: {
configurePlatforms = [];
});
sane-backends = prev.sane-backends.overrideAttrs (_old: {
CFLAGS = "-DHAVE_MMAP=0";
});
curl = prev.curl.overrideAttrs (_old: {
CFLAGS = "-w";
LDFLAGS = "-latomic";
});
x265 = prev.x265.override { multibitdepthSupport = false; };
}) })
]; ];