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/gcc-wrapper-old/default.nix | |
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/gcc-wrapper-old/default.nix')
-rw-r--r-- | pkgs/build-support/gcc-wrapper-old/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index f44aaec5d9d7..a7801e239e9c 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -5,7 +5,7 @@ # stdenv.mkDerivation provides a wrapper that sets up the right environment # variables so that the compiler and the linker just "work". -{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +{ name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" , zlib ? null }: @@ -41,10 +41,10 @@ stdenv.mkDerivation { addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix gcc; - gcc_lib = gcc.lib or gcc; + gcc_lib = lib.getLib gcc; libc = if nativeLibc then null else libc; - libc_dev = if nativeLibc then null else libc.dev or libc; - libc_bin = if nativeLibc then null else libc.bin or libc; + libc_dev = if nativeLibc then null else lib.getDev libc; + libc_bin = if nativeLibc then null else lib.getBin libc; binutils = if nativeTools then null else binutils; # The wrapper scripts use 'cat', so we may need coreutils coreutils = if nativeTools then null else coreutils; |