diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-12 16:10:54 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-12 16:10:54 +0200 |
| commit | 2cfeca153cd9418d91c301e182caee1d3f6262e7 (patch) | |
| tree | 624ebd60c597390c8c8d5d9e5228e0bc4006504f | |
| parent | c3cbe0452a8ce4d909a8325a5abaa404a21f53f5 (diff) | |
| download | nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.tar nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.tar.gz nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.tar.bz2 nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.tar.lz nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.tar.xz nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.tar.zst nixlib-2cfeca153cd9418d91c301e182caee1d3f6262e7.zip | |
openssl, cups: Fix stripping libraries
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8ba7e41425b8..6a3beee80de4 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -82,6 +82,10 @@ stdenv.mkDerivation { mkdir $dev mv $out/include $dev/ + + # OpenSSL installs readonly files, which otherwise we can't strip. + # FIXME: Can remove this after the next stdenv merge. + chmod -R +w $out ''; # */ crossAttrs = { @@ -92,14 +96,6 @@ stdenv.mkDerivation { export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}" ''; - postInstall = '' - # Openssl installs readonly files, which otherwise we can't strip. - # This could at some stdenv hash change be put out of crossAttrs, too - chmod -R +w $out - - # Remove references to perl, to avoid depending on it at runtime - rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget - ''; configureScript = "./Configure"; }; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d479e6e69718..be442fd22a61 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation { '' mkdir $dev/bin mv $out/bin/cups-config $dev/bin/ + + chmod -R +w $out ''; meta = { |