diff options
| author | Emily <vcs@emily.moe> | 2020-02-08 15:31:51 +0000 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2020-02-08 23:00:07 -0600 |
| commit | c2fd1a9418da0327bad0a331036bb64a70bab7b4 (patch) | |
| tree | ca9b1708972815984551419f7389e65fbe8cce0e /pkgs/development | |
| parent | a14a32fd7585cf6f7cd4712d2bd967fcce1171e8 (diff) | |
| download | nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.tar nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.tar.gz nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.tar.bz2 nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.tar.lz nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.tar.xz nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.tar.zst nixlib-c2fd1a9418da0327bad0a331036bb64a70bab7b4.zip | |
icestorm: use passthru attribute
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/icestorm/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index a7af74a8dc8f..58ccb5d4cef4 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { pname = "icestorm"; version = "2019.09.13"; - pythonPkg = if usePyPy then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; + passthru = rec { + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; + }; src = fetchFromGitHub { owner = "cliffordwolf"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pythonPkg libftdi1 ]; + buildInputs = [ passthru.pythonPkg libftdi1 ]; makeFlags = [ "PREFIX=$(out)" ]; enableParallelBuilding = true; @@ -39,12 +41,12 @@ stdenv.mkDerivation rec { --replace /usr/local/share "$out/share" for x in icefuzz/Makefile icebox/Makefile icetime/Makefile; do - substituteInPlace "$x" --replace python3 "${pythonInterp}" + substituteInPlace "$x" --replace python3 "${passthru.pythonInterp}" done for x in $(find . -type f -iname '*.py'); do substituteInPlace "$x" \ - --replace '/usr/bin/env python3' '${pythonInterp}' + --replace '/usr/bin/env python3' '${passthru.pythonInterp}' done ''; |