Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c2570ef90712
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b531a3bbd6c5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 12, 2019

  1. Merge #61181: spl: fix build with linux 5.1 

    (cherry picked from commit 359a734)
    @vcunat
    vcunat committed May 12, 2019
    Copy the full SHA
    b531a3b View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/os-specific/linux/spl/default.nix
5 changes: 5 additions & 0 deletions pkgs/os-specific/linux/spl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {

patches = [ ./install_prefix.patch ];

# Backported fix for 0.7.13 to build with 5.1, please remove when updating to 0.7.14
postPatch = optionalString (versionAtLeast kernel.version "5.1") ''
sed -i 's/get_ds()/KERNEL_DS/g' module/spl/spl-vnode.c
'';

nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;

hardeningDisable = [ "fortify" "stackprotector" "pic" ];