ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

rpm: Fix python3 detection hack

Browse Source 
Commit 5dff3c4b68 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
This commit is contained in:
Tuomas Tynkkynen 2016-05-07 17:50:51 +03:00
parent 5b90702cd6
commit 24b046ce05
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/package-management/rpm/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
# For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here # 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' "" substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' ""
''; '';