public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux_mptcp: makes linux_mptcp.override works

Browse Source 
I needed to override some parameters because of an error I had:
"Error: modDirVersion specified in the Nix expression is wrong, it should be: 4.9.60+"

but the following override would not be taken into account
  pkg.override ({
    modDirVersion="4.9.60+";
    src=pkgs.lib.cleanSource /home/teto/mptcp;
  })

because the override would be overriden by the nixpkgs parameters
because of concatenation order:
https://nixos.org/nix/manual/#sec-language-operators
This commit is contained in:
Matthieu Coudron 2017-11-14 03:42:11 +09:00 committed by Robin Gloster
parent cc17b42dc7
commit 38737386d5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-mptcp.nix
View File

@ -1,6 +1,6 @@
{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec { import ./generic.nix (rec {
mptcpVersion = "0.93"; mptcpVersion = "0.93";
modDirVersion = "4.9.60"; modDirVersion = "4.9.60";
version = "${modDirVersion}-mptcp_v${mptcpVersion}"; version = "${modDirVersion}-mptcp_v${mptcpVersion}";
@ -43,4 +43,4 @@ import ./generic.nix (args // rec {
TCP_CONG_BALIA m TCP_CONG_BALIA m
'' + (args.extraConfig or ""); '' + (args.extraConfig or "");
} // (args.argsOverride or {})) } // args // (args.argsOverride or {}))