diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-25 13:43:57 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-27 03:15:50 -0500 |
commit | e755a8a27d5c33d87a5742817c373028d35443e9 (patch) | |
tree | 68999720a17f0c6f71f35a7835030f44d409af0f /pkgs/development/libraries/zlib | |
parent | fbbda41e05d89325baaefef6fd0a420a1c365d7e (diff) | |
download | nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.tar nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.tar.gz nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.tar.bz2 nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.tar.lz nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.tar.xz nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.tar.zst nixlib-e755a8a27d5c33d87a5742817c373028d35443e9.zip |
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of their target platform so that multiple builds can be used at once without clobbering each other on the PATH. I was using identifiers named `prefix` for this purpose, but that conflicts with the standard use of `prefix` to mean the directory where something is installed. To avoid conflict and confusion, I renamed those to `targetPrefix`.
Diffstat (limited to 'pkgs/development/libraries/zlib')
-rw-r--r-- | pkgs/development/libraries/zlib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index ceb4bb9f370b..de2e0b62f9e2 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; makeFlags = [ - "PREFIX=${stdenv.cc.prefix}" + "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" ] ++ stdenv.lib.optionals (!static) [ |