diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-13 23:04:18 +0200 |
| commit | 2fec9c6e297e02718db6be53d645524f0052a7bc (patch) | |
| tree | 93e73a98dfaa40b290a6e15cf7f61054e5dc59e0 /pkgs/build-support | |
| parent | e9961bf9a9f7410c2891c7e86c21ed6388c70d78 (diff) | |
| parent | ba816ee08721d0c2f5f7e6652091bed085ac7687 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/development/tools/build-managers/conan/default.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 5 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 8 | ||||
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index da8a86b68f5d4..d951fb9ab06ed 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,11 +52,14 @@ let export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32' export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin' + export TZDIR='/etc/zoneinfo' # Force compilers and other tools to look in default search paths + unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32' + export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' + export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' export PKG_CONFIG_PATH=/usr/lib/pkgconfig export ACLOCAL_PATH=/usr/share/aclocal diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 691d4bb74dbfe..315440349b6b6 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -116,4 +116,12 @@ rec { Env = [ "NIX_PAGER=cat" ]; }; }; + + # 7. example of adding something on top of an image pull by our + # dockerTools chain. + onTopOfPulledImage = buildImage { + name = "onTopOfPulledImage"; + fromImage = nixFromDockerHub; + contents = [ pkgs.hello ]; + }; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index d612db64c122a..b0d3f373a4622 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -129,7 +129,7 @@ rec { samba = [ https://www.samba.org/ftp/ - http://ftp.riken.jp/net/samba + http://www.samba.org/ftp/ ]; # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . |