Commit Graph

19 Commits

Author SHA1 Message Date
John Ericson
da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
John Ericson
f6f40e3fe5 stdenv-setup and misc pkgs: Revert to space-deliminated propagated-* files
We cannot switch to line-delimited yet, because certain Nix commands do
not read in the entire file, but just the first line.
2017-07-26 09:07:55 -04:00
John Ericson
3cb745d5a6 stdenv: Store one package per line in nix-support/propagated-*
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.

Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.

Two misc notes:

 - `propagated-user-env-packages` also needed to be adjusted as
   sometimes it is copied to/from the propagated input files.

 - `local fd` should ensure that file descriptors aren't clobbered
   during recursion.
2017-07-10 13:32:13 -04:00
Jérémie FRAUDEAU
12df6d88d8 openjdk-darwin: zulu1.8.0_66 -> zulu1.8.0_121 2017-03-27 13:56:58 +02:00
Dan Peebles
0cfa1b0dde openjdk-darwin: use a sensible crypto policy
We should really move to a source build of openjdk on Darwin, but that's
tricky so for now we continue to hack around it and do stuff like this,
even though crypto export polices are stupid and make no sense. No, I'm
not bitter at all that I need to do this 😩
2017-03-15 16:37:57 -04:00
Matthew Justin Bauer
fd2cf186b0 openjdk-darwin: Fix libfreetype path (#21089)
The freetype path was not working. This fixes it to use the nix
freetype version with install_name_tool.
2016-12-13 09:47:50 +01:00
Rob Vermaas
3da892a18e Add binary openjdk 8 build for x86_64-darwin, similar to the openjdk 7 build for x86_64-darwin.
(cherry picked from commit 5f3e33b8ec)
2016-01-14 10:29:18 +00:00
Vladimír Čunát
995c9db5e6 openjdk: add platforms on darwin to fix #5634 2015-01-13 16:42:32 +01:00
William A. Kennington III
3e931d40d7 openjdk-darwin: Add missing home passthru 2015-01-07 15:02:14 -08:00
William A. Kennington III
bbc4262514 java: Add home passthru 2015-01-07 14:55:41 -08:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Eelco Dolstra
3c58261c67 Fix setting $JAVA_HOME 2014-07-16 18:34:14 +02:00
Eelco Dolstra
caa74a146d openjdk-darwin: Update to 7u60b30 2014-07-15 11:51:07 +02:00
Charles Strahan
abc3a27dbc fix openjdk url for Darwin 2014-06-25 15:01:13 -04:00
Eelco Dolstra
5150dbfdbe openjdk-darwin: Behave the same as openjdk-linux 2014-01-28 12:10:27 +01:00
Shea Levy
c056a69fdd darwin openjdk: set jre attribute.
Fixes tarball

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-15 01:06:04 -05:00
Shea Levy
c592992b14 Fix tarball 2012-10-04 19:53:10 -04:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Rob Vermaas
82447aa73e added openjdk for darwin (binaries) for testing
svn path=/nixpkgs/trunk/; revision=17596
2009-10-02 12:12:23 +00:00