diff options
| author | Vladimir Still <vl.still@gmail.com> | 2014-02-07 22:53:55 +0100 |
|---|---|---|
| committer | Vladimir Still <vl.still@gmail.com> | 2014-02-07 22:53:55 +0100 |
| commit | d3979b659cb385597baecf5518a614089b489424 (patch) | |
| tree | a72c2177b31028cca8b929afbf4a8ae1d15c2d33 /pkgs/os-specific/linux/kernel/perf.nix | |
| parent | 70e4f8f928f8cc29414b3d49d92cb328f85a4437 (diff) | |
| download | nixlib-d3979b659cb385597baecf5518a614089b489424.tar nixlib-d3979b659cb385597baecf5518a614089b489424.tar.gz nixlib-d3979b659cb385597baecf5518a614089b489424.tar.bz2 nixlib-d3979b659cb385597baecf5518a614089b489424.tar.lz nixlib-d3979b659cb385597baecf5518a614089b489424.tar.xz nixlib-d3979b659cb385597baecf5518a614089b489424.tar.zst nixlib-d3979b659cb385597baecf5518a614089b489424.zip | |
perf: Make build fix for 3.13 cleaner.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/perf.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index f486f55654e6..a7337760b79e 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -4,6 +4,9 @@ assert withGtk -> gtk != null; +let optionalString = stdenv.lib.optionalString; + versionOlder = stdenv.lib.versionOlder; +in stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; @@ -12,7 +15,7 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile - patch -p1 < ${./perf.diff} || true + ${optionalString (versionOlder kernel.version "3.13") "patch -p1 < ${./perf.diff}"} [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion export makeFlags="DESTDIR=$out $makeFlags" ''; |