Matthew Bauer
989b403c7f
Merge pull request #96318 from matthewbauer/provide-patchelf-in-native-stdenv
...
stdenv/native: provide patchelf on linux
2020-10-30 13:32:13 -05:00
Vladimír Čunát
c778945806
Revert "Merge #101508 : libraw: 0.20.0 -> 0.20.2"
...
I'm sorry; I didn't notice it contained staging commits.
This reverts commit 17f5305b6c
, reversing
changes made to a8a018ddc0
.
2020-10-25 09:41:51 +01:00
John Ericson
e54f6b1fde
Merge pull request #99401 from Ericson2314/cmake-optional-openssl
...
cmake: Tighten deps
2020-10-13 22:13:13 -04:00
John Ericson
e75f863bd4
darwin bootstrapping: Dedup code a bit
2020-10-13 19:26:13 -04:00
Frederik Rietdijk
692d219a93
Merge staging-next into staging
2020-10-06 10:25:58 +02:00
Daniël de Kok
f92809bcee
Merge pull request #97000 from danieldk/stdenv-darwin-unset-sdkroot
...
stdenv: unset SDKROOT on Darwin
2020-09-14 07:37:50 +02:00
Robert Helgesson
fbc5093649
hooks: add moveSystemdUserUnitsHook
...
This hook moves systemd user service file from `lib/systemd/user` to
`share/systemd/user`. This is to allow systemd to find the user
services when installed into a user profile. The `lib/systemd/user`
path does not work since `lib` is not in `XDG_DATA_DIRS`.
2020-09-12 18:29:46 +02:00
Matthew Bauer
61517de024
Merge pull request #93912 from thefloweringash/cctools-tapi
...
stdenv/darwin: enable tapi support in cctools
2020-09-10 23:23:52 -05:00
Silvan Mosberger
560bb92473
Merge pull request #76794 from dudebout/document-nix-env-multiple-output-install-bug
...
document nix-env bug relating to multiple output installation
2020-09-05 15:40:26 +02:00
Nicolas Dudebout
611258f063
document nix-env bug relating to multiple output installation
2020-09-05 05:31:54 -04:00
Daniël de Kok
b1700a7336
stdenv: unset SDKROOT on Darwin
...
The Rust `cc` crate started running `xcrun` when SDKROOT is defined:
a970b0ab0b
Consequently, building crates that use newer versions of the `cc`
crate fail, because xcrun is not available in pure build environments.
2020-09-03 09:46:21 +02:00
Silvan Mosberger
911497988f
Merge pull request #95536 from Infinisil/inputDerivation
...
mkDerivation: Introduce .inputDerivation for shell.nix build convenience
2020-08-31 15:46:41 +02:00
Matthew Bauer
54210573c1
stdenv/native: provide patchelf on linux
...
This provides consistency with the pure stdenv, which provides
patchelf this way. Native stdenv can always just manually install
patchelf on their system, but like xz, it’s unlikely to be provided in
/usr/bin/. In addition, it’s not even in the RHEL7 repos.
2020-08-25 17:54:27 -05:00
Andrew Childs
630f5d30df
stdenv/darwin: enable tapi support in cctools
2020-08-21 01:09:42 +09:00
Matthew Bauer
a378ae61e2
Merge pull request #95129 from aaronjanse/aj-fix-llvm-for-redox
...
mkDerivation: use `Generic` as system name for Redox in cmakeFlags
2020-08-19 15:07:20 -05:00
Silvan Mosberger
3e1a40df75
mkDerivation: Introduce .inputDerivation for shell.nix build convenience
...
This introduces the .inputDerivation attribute on all derivations
created with mkDerivation. This is another derivation that can always
build successfully and whose runtime dependencies are the build time
dependencies of the original derivation.
This allows easy building and distributing of all derivations needed to
enter a nix-shell with
nix-build shell.nix -A inputDerivation
2020-08-16 00:24:48 +02:00
Aaron Janse
eb970b6241
mkDerivation: handle Redox in cmakeFlags
2020-08-10 19:52:54 -07:00
Emery Hemingway
f5ef00a12f
gnu-config: 2019-04-15 -> 2020-05-04
...
Update gnu-config (config.sub, config.guess) to suport the Genode
platform and apply the updateAutotoolsGnuConfigScriptsHook to Genode
cross-compilation.
2020-08-02 22:37:39 +02:00
Jörg Thalheim
f6a30fcac5
Merge pull request #89794 from Mic92/source-date-epoch
2020-08-01 10:08:18 +01:00
Aaron Janse
60fd049b65
redox: add as target
2020-07-21 13:11:36 -07:00
Vladimír Čunát
377324ca6d
Merge branch 'staging-next' (PR #91090 )
2020-07-13 07:13:56 +02:00
Ben Wolsieffer
18c8866f77
stdenv: correctly make stdenv.system
refer to the host platform
...
This was supposed to be done in 773233ca77
, but was not due to a small
mistake.
2020-07-11 16:06:08 -04:00
John Ericson
f3f7612a40
C++ Compilers: Systematize handling of standard libraries
2020-06-22 04:24:44 +00:00
Silvan Mosberger
4aabac8d88
Merge pull request #86223 from pikajude/darwin-static-eval
...
pkgsStatic: use clang for C compiler on Darwin
2020-09-30 23:44:18 +02:00
zowoq
b78a0348d3
stdenv/check-meta: alignment/width
2020-06-11 12:35:11 +10:00
Vladimír Čunát
a5f5d020c6
Merge branch 'staging-next'
2020-06-10 16:13:48 +02:00
Geoffrey Huntley
ffa5137278
docs: increase awareness of NIXPKGS_ALLOW_INSECURE=1
...
496bc90c6c/doc/using/configuration.xml (L190)
2020-06-10 18:16:31 +10:00
Jörg Thalheim
bc4927a526
stdenv: set SOURCE_DATE_EPOCH to a value python supports
...
in nix-shell this value breaks the build because python's
packaging refuses to build timestamps that date before 1980.
2020-06-08 11:54:46 +01:00
John Ericson
cc1af0751f
Merge pull request #89036 from Ericson2314/fix-mesa-wayland-cross
...
mesa wayland: Fix/simplify cross
2020-05-27 16:45:05 -04:00
John Ericson
162c0c3e61
mkDerivation: Don't need to specify pkg-config for meson any more
...
Env var will work fine.
2020-05-27 16:07:58 +00:00
Matthew Bauer
fb35227b8c
Merge pull request #87583 from Gaelan/single-llvm
...
stdenv-darwin: now with 50% less LLVM!
2020-05-15 18:56:17 -05:00
Matthew Bauer
d38bad590e
Merge pull request #83180 from matthewbauer/only-add-ldflags-for-macos
...
bintools: only add macos flags when targeting macOS
2020-05-13 10:34:40 -05:00
John Ericson
1ac5398589
*-wrapper; Switch from infixSalt
to suffixSalt
...
I hate the thing too even though I made it, and rather just get rid of
it. But we can't do that yet. In the meantime, this brings us more
inline with autoconf and will make it slightly easier for me to write a
pkg-config wrapper, which we need.
2020-05-12 00:44:44 -04:00
Gaelan Steele
23ce1eed34
stdenv: only build LLVM once on darwin
2020-05-11 10:28:31 -07:00
John Ericson
05d26adb0a
mkDerivation mesonFlags: Fix arm cpu families
...
In my haste to unbreak eval, I screwed up and got the bit-widths,
backwards.
2020-04-28 22:56:20 -04:00
John Ericson
cf858e6d57
mkDerivation mesonFlags: Fix cross file logic to handle more cases
...
Otherwise eval breaks
2020-04-28 16:51:44 -04:00
Jude Taylor
0de6275003
pkgsStatic: fix eval on Darwin
2020-04-28 08:41:48 -07:00
John Ericson
8245230753
meson: Make target-agnostic
...
The cross file is added in the `mkDerivation`. It isn't nice putting
build tool-specific stuff here, but our current architecture gives us
little alternative.
2020-04-28 10:55:33 -04:00
Jan Tojnar
b4a6714571
Merge branch 'staging-next' into staging
2020-04-13 18:54:59 +02:00
worldofpeace
5384d72885
setup.sh: add dontPatch
...
Fixes #85038
2020-04-12 07:04:35 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs
2020-04-10 17:54:53 +01:00
Matthew Bauer
e0fb0df64f
generic/setup.sh: allow clobbering env-vars file
...
If the option ‘noclobber’ is set in Bash, we get an error when we
clobber an already existing env-vars. This is an okay error to ignore,
so just >| instead. Note that >| is NOT a Bashism[[1]].
Fixes #79651
[1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_02
2020-04-09 22:39:16 -04:00
Matthew Bauer
e45f16b9f5
stdenv/linux: remove powerpc64le bootstrap tools
...
These files never existed, so best to not leave the reference. If
someone want to step up to maintain this, that would be fine. I don’t
have the hardware to test these out. In addition, someone tried to use
the bootstrap-tools currently built by Hydra and found that they were
broken in some unclear way.
2020-03-31 15:03:26 -04:00
Matthew Bauer
b0b0a06788
bintools: only add macos flags when targeting macOS
...
We can’t set this for cross-compiling since we use the GNU linker.
Instead, set these flags only when targetPlatform is macOS.
Fixes #80754
Fixes #83141
2020-03-23 00:32:45 -04:00
Graham Christensen
6b361c3a31
armv{5tel,6l,7l}: bootstrap-files: quote URLs for rfc-45
...
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2020-03-16 19:04:39 -04:00
Graham Christensen
11b54adeac
armv{5tel,6l,7l}: update bootstrap tools after #80497
2020-03-16 18:11:59 -04:00
Frederik Rietdijk
0eb0ddc4db
Merge staging-next into master
2020-03-08 08:11:01 +01:00
Ben Wolsieffer
05fc2a3524
unpack-bootstrap-tools: remove obsolete linker script patching
...
The linker scripts no longer contain store paths, so this does nothing. More
importantly, libpthread.so is not longer a linker script on ARM, so the patching
would corrupt it.
2020-03-06 06:58:20 +01:00
Ben Wolsieffer
ee39e49b68
stdenv: update ARM bootstrap tarballs
...
Fixes building glibc 2.30, which requires at least GCC 6.
Picked from the following cross-trunk evaluation:
https://hydra.nixos.org/eval/1568864 based on nixpkgs
commit ac241fb7a5
.
armv5tel job: https://hydra.nixos.org/build/111556418
armv6l job: https://hydra.nixos.org/build/111556521
armv7l job: https://hydra.nixos.org/build/111556551
2020-03-06 06:58:20 +01:00
Ben Wolsieffer
4478766b64
make-bootstrap-tools: add libssp to allow stack protector to work
2020-02-18 22:40:30 -05:00