summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichal Sojka <michal.sojka@cvut.cz>2022-03-10 23:49:46 +0100
committerMichal Sojka <michal.sojka@cvut.cz>2022-06-18 09:02:41 +0200
commit8d9773fec413cb7641306fa30a48f0988c45a734 (patch)
tree589c67b31a7867ab14021b01837f1cba9e08a06f
parentf63020259750bb2433ce9333009516ff20fb67fa (diff)
downloadnixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.tar
nixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.tar.gz
nixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.tar.bz2
nixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.tar.lz
nixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.tar.xz
nixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.tar.zst
nixpkgs-8d9773fec413cb7641306fa30a48f0988c45a734.zip
libtraceevent: 1.5.1 -> 1.5.3
substituteInPlace was probably needed even in the older versions.
Without this, make prints:

    make[1]: /bin/pwd: No such file or directory
-rw-r--r--pkgs/os-specific/linux/libtraceevent/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix
index 7ec8ac35e62..4e3fd1b2e07 100644
--- a/pkgs/os-specific/linux/libtraceevent/default.nix
+++ b/pkgs/os-specific/linux/libtraceevent/default.nix
@@ -1,18 +1,19 @@
-{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }:
+{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, coreutils }:
 
 stdenv.mkDerivation rec {
   pname = "libtraceevent";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
     rev = "libtraceevent-${version}";
-    sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI=";
+    sha256 = "sha256-TaJOwunejEdJz84p3CkGvtR++jN+hXedyxxN+RoeXko=";
   };
 
   # Don't build and install html documentation
   postPatch = ''
     sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile
+    substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd
   '';
 
   outputs = [ "out" "dev" "devman" ];