diff options
| author | mornfall <me@mornfall.net> | 2014-02-08 11:32:10 +0100 |
|---|---|---|
| committer | mornfall <me@mornfall.net> | 2014-02-08 11:32:10 +0100 |
| commit | 24966fff2195e7fdcb81b54a365546b728bed7d2 (patch) | |
| tree | e9dd379560478363d9752c13806ee6823c327f3a | |
| parent | 0fa30be7a8725392f92aeb959e880ae5cf1ef891 (diff) | |
| parent | d3979b659cb385597baecf5518a614089b489424 (diff) | |
| download | nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.tar nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.tar.gz nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.tar.bz2 nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.tar.lz nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.tar.xz nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.tar.zst nixlib-24966fff2195e7fdcb81b54a365546b728bed7d2.zip | |
Merge pull request #1702 from vlstill/perf-fix
perf: Allow proceeding in build even if patch fails.
| -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 0a92e39c153a..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} + ${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" ''; |