diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-14 19:00:39 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:24:39 +0300 |
commit | 5ff40ddedfe3188749faa21d71ac013277aff1d1 (patch) | |
tree | 04a39e7c45ffbd82e17fc22c2a4998d0d34787f3 /pkgs/build-support/cc-wrapper | |
parent | c779e30d531032a7744685e80c2143b358efe1b0 (diff) | |
download | nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.gz nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.bz2 nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.lz nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.xz nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.tar.zst nixlib-5ff40ddedfe3188749faa21d71ac013277aff1d1.zip |
add get* helper functions and mass-replace manual outputs search with them
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6cdd04772445..6bdb35b912a7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -27,13 +27,13 @@ let ccVersion = (builtins.parseDrvName cc.name).version; ccName = (builtins.parseDrvName cc.name).name; - libc_bin = if nativeLibc then null else libc.bin or libc; - libc_dev = if nativeLibc then null else libc.dev or libc; - libc_lib = if nativeLibc then null else libc.out or libc; - cc_solib = cc.lib or cc; - binutils_bin = if nativeTools then "" else binutils.bin or binutils; + libc_bin = if nativeLibc then null else getBin libc; + libc_dev = if nativeLibc then null else getDev libc; + libc_lib = if nativeLibc then null else getLib libc; + cc_solib = getLib cc; + binutils_bin = if nativeTools then "" else getBin binutils; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = if nativeTools then "" else coreutils.bin or coreutils; + coreutils_bin = if nativeTools then "" else getBin coreutils; in stdenv.mkDerivation { |