From 24b046ce0534f3878ef2647dfbdcc0aa2ae5f80c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 7 May 2016 17:50:51 +0300 Subject: [PATCH] rpm: Fix python3 detection hack Commit 5dff3c4b68e16 made rpm use autoreconfHook, so the patch that we are making to `configure` gets lost when the file is regenerated. To fix this, just patch the equivalent string in the `configure.ac` file instead. Fixes #15287 --- pkgs/tools/package-management/rpm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index d9cf24f6e51..c0a4f7f693d 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here - substituteInPlace configure --replace 'python''${PYTHON_VERSION}' ${python.executable} + substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" '';