diff options
| author | Domen Kožar <domen@dev.si> | 2014-10-14 13:48:46 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-10-14 13:48:55 +0200 |
| commit | 9db2312a50bc961515ec9e93d7992bb0f3758ae8 (patch) | |
| tree | 4248e17aed3283675b861c0fcd01a47c6e29663f /pkgs/os-specific/linux/lttng-modules/default.nix | |
| parent | a1217e5b1a3d1d4aba4d3cd2507cf453b8ab54b1 (diff) | |
| download | nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.tar nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.tar.gz nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.tar.bz2 nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.tar.lz nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.tar.xz nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.tar.zst nixpkgs-9db2312a50bc961515ec9e93d7992bb0f3758ae8.zip | |
lttng-modules: fix on kernel 3.2, 3.16, 3.17
Diffstat (limited to 'pkgs/os-specific/linux/lttng-modules/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/lttng-modules/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 68012ac9a64..9fdb5b42bf8 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchgit, kernel }: + +assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 stdenv.mkDerivation rec { - pname = "lttng-modules-2.5.0"; + pname = "lttng-modules-${rev}"; name = "${pname}-${kernel.version}"; + rev = "bf2ba318fff"; - src = fetchurl { - url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2"; - sha256 = "0ayqi974ibaybzm46nb2ij1avqm1gspd4mnkpfc4ajl34j02dyix"; + src = fetchgit { + url = "https://github.com/lttng/lttng-modules.git"; + sha256 = "0x70xp463g208rdz5b9b0wdwr2v8px1bwa589knvp4j7zi8d2gj9"; + inherit rev; }; - patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ]; - preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" |