From 8b5e6b7711b19baded1e972f98386d1dd4bb7b14 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 12 Jan 2019 15:29:35 -0600 Subject: [PATCH] icestorm: minor cleanup with pythonPkg.interpreter [NFC] Suggested cleanup by @dotlambda. See: https://github.com/NixOS/nixpkgs/commit/18839e1cc1a0c2ee787a8990809141cf43e1848c#commitcomment-31917295 Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 0d96ec02c4ca..5cec122950f0 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -6,7 +6,7 @@ let pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */ pythonPkg = if pypyCompatible then pypy3 else python3; - pythonInterp = if pypyCompatible then "pypy3" else "python3"; + pythonInterp = pythonPkg.interpreter; in stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { for x in $(find . -type f -iname '*.py'); do substituteInPlace "$x" \ - --replace '/usr/bin/env python3' '${pythonPkg}/bin/${pythonInterp}' + --replace '/usr/bin/env python3' '${pythonInterp}' done '';