summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2017-11-14 03:42:11 +0900
committerRobin Gloster <mail@glob.in>2017-11-13 11:19:26 +0100
commit38737386d5f6ac8bb5fa999712905058292ea5f7 (patch)
tree7a462a963a19100965110a4e617df9e2fd61a3f2
parentcc17b42dc72721a824f1fd94d352a41487771cee (diff)
downloadnixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.tar
nixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.tar.gz
nixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.tar.bz2
nixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.tar.lz
nixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.tar.xz
nixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.tar.zst
nixlib-38737386d5f6ac8bb5fa999712905058292ea5f7.zip
linux_mptcp: makes linux_mptcp.override works
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
-rw-r--r--pkgs/os-specific/linux/kernel/linux-mptcp.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index c7e9859ded79..92b202100a63 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -1,6 +1,6 @@
 { stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
-import ./generic.nix (args // rec {
+import ./generic.nix (rec {
   mptcpVersion = "0.93";
   modDirVersion = "4.9.60";
   version = "${modDirVersion}-mptcp_v${mptcpVersion}";
@@ -43,4 +43,4 @@ import ./generic.nix (args // rec {
     TCP_CONG_BALIA m
 
   '' + (args.extraConfig or "");
-} // (args.argsOverride or {}))
+} // args // (args.argsOverride or {}))