Commit Graph

45 Commits

Author SHA1 Message Date
Guillaume Maudoux
bfd522da63 setup-hooks: do not pass missing dirs to find (close #15405)
find fails when called with an inexistent search path.
That situation may arise when the output is created after by a postFixup hook.
vcunat amended the PR by clarifying one more `return` to `return 0`.
2016-05-22 12:08:01 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Eelco Dolstra
d255a8980a patchelf: Use 0.9 release tarball 2016-02-29 11:35:59 +01:00
Eelco Dolstra
424af2cd52 patchelf: 0.8 -> 0.9 2016-02-27 21:47:59 +01:00
Eelco Dolstra
aff0451c10 patchELF: Use correct directory
Borrowed from https://github.com/NixOS/nixpkgs/pull/13395.
2016-02-24 11:13:36 +01:00
Eelco Dolstra
d71a4851e8 Don't try to apply patchelf to non-ELF binaries 2016-02-18 22:54:11 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
Vladimír Čunát
862900e42e mass-replace deprecated usage of find -perm (Fixes #9044)
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
Vladimír Čunát
3ec413cece WIP 2014-08-25 15:30:46 +02:00
Vladimír Čunát
77da5efc78 merge the rest of multiple-outputs
Conflicts:
	pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
	pkgs/development/tools/misc/patchelf/default.nix (easy)
	pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
2def8e7499 Remove addHook
Just use bash arrays directly. I.e.

  addHook preConfigure myPreConfigure

is now

  preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra
d7a4fa26b0 Fix dontPatchELF being set after the setup script has been sourced 2014-08-09 12:44:49 +02:00
Eelco Dolstra
83a41771ab Move RPATH shrinking from stdenv to a setup hook provided by patchelf 2014-08-09 12:44:49 +02:00
Eelco Dolstra
7a6255e4e1 patchelf: Update to 0.8
This fixes a segfault in building Eclipse and the Android SDK.
2014-01-14 14:21:27 +01:00
Eelco Dolstra
ffd6557dc6 patchelf: Update to 0.7 2014-01-07 17:44:03 +01:00
Eelco Dolstra
c3cbe0452a patchelf: Enable "make check" 2013-06-12 14:59:39 +02:00
Eelco Dolstra
d7fc07705a Add latest patchelf prerelease 2012-08-21 15:57:41 -04:00
Eelco Dolstra
91ab98ce09 * Update patchelf.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30312
2011-11-08 01:30:02 +00:00
Eelco Dolstra
6a73467eac * Chromium updated to the latest version. Because Chromium now used
Gold, this requires a new patchelf.
* Changed the package name from ‘chrome’ to ‘chromium’.

svn path=/nixpkgs/trunk/; revision=29197
2011-09-11 20:48:02 +00:00
Karn Kallio
8af7cabe21 Update patchelf 0.6 to latest prerelease 23458.
The older prerelease did not download; Hydra said the product had disappeared.

svn path=/nixpkgs/trunk/; revision=25350
2011-01-02 22:35:02 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Lluís Batlle i Rossell
4b79027f45 Updating the patchelf0.6 reference, so it gets the changes to work in mips
(16KiB pages)

svn path=/nixpkgs/branches/stdenv-updates/; revision=22853
2010-08-01 21:26:10 +00:00
Rob Vermaas
94bf409baf updated patchelf 0.6 source to a link that should not be garbage collected
svn path=/nixpkgs/trunk/; revision=22556
2010-07-12 10:09:09 +00:00
Rob Vermaas
a07cdd3b23 * added patchelf pre-release 0.6 until it gets stable
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
2010-05-18 12:36:23 +00:00
Eelco Dolstra
4e65c8aa2a * Use patchelf 0.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19548
2010-01-19 17:15:47 +00:00
Eelco Dolstra
e7edaef873 * Latest patchelf.
svn path=/nixpkgs/trunk/; revision=16017
2009-06-22 11:14:51 +00:00
Eelco Dolstra
143787ad74 * PatchELF 0.5pre15500. Needed for --force-rpath.
svn path=/nixpkgs/trunk/; revision=15951
2009-06-13 16:10:24 +00:00
Eelco Dolstra
5d6247cb96 * Use 0.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11977
2008-06-04 11:27:35 +00:00
Eelco Dolstra
c6e98aeba3 * Doh!
svn path=/nixpkgs/branches/stdenv-updates/; revision=11959
2008-06-03 14:36:15 +00:00
Eelco Dolstra
5fadd928bc * Use a fixed patchelf.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11958
2008-06-03 14:29:14 +00:00
Eelco Dolstra
0901882c1e * Use the latest patchelf.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11931
2008-05-29 14:19:34 +00:00
Eelco Dolstra
e6779a3701 * Use patchelf 0.3.
svn path=/nixpkgs/trunk/; revision=8767
2007-05-24 16:00:05 +00:00
Eelco Dolstra
b29ff1281b * Use the latest patchelf on x86_64.
svn path=/nixpkgs/trunk/; revision=7867
2007-02-06 21:12:30 +00:00
Eelco Dolstra
0d299bc2f7 * Purify aangifte2005. Now we can do our taxes in NixOS ;-)
svn path=/nixpkgs/trunk/; revision=4980
2006-03-03 22:31:16 +00:00
Eelco Dolstra
3c1c258aa5 * Use PatchELF 0.1.
svn path=/nixpkgs/trunk/; revision=4062
2005-10-11 13:31:33 +00:00
Eelco Dolstra
bbbf730cb0 * Use the latest patchelf.
svn path=/nixpkgs/trunk/; revision=4006
2005-10-04 13:21:33 +00:00
Eelco Dolstra
07be11540a * Oops. Add missing file.
svn path=/nixpkgs/trunk/; revision=3998
2005-10-03 08:35:25 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
5b6b8d3e3e * Use the latest patchelf. This fixes broken gconv modules (e.g.,
$glibc/lib/gconv/ISO-2022-JP.so has an RPATH of `$ORIGIN' so that it
  can find glibc/lib/gconv/libJIS.so; `$ORIGIN' should not be filtered
  out of the RPATH).

svn path=/nixpkgs/trunk/; revision=2290
2005-02-23 14:15:33 +00:00
Eelco Dolstra
b6001eed67 * Use patchelf to remove unnecessary directories automatically (in the
installation phase) from the rpaths of ELF executables and
  libraries.  This results in smaller closures.

svn path=/nixpkgs/trunk/; revision=1534
2004-10-02 18:27:50 +00:00
Eelco Dolstra
3016830968 * Patchelf updated to latest prerelease.
svn path=/nixpkgs/trunk/; revision=1522
2004-09-27 19:36:44 +00:00
Eelco Dolstra
8cbdcb4b03 * Added patchelf.
svn path=/nixpkgs/trunk/; revision=1505
2004-09-25 19:32:23 +00:00