summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-04 19:48:08 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-01-04 19:48:08 +0000
commitca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6 (patch)
tree437b1ecb2872735603332cad101a744cfbaa5a70 /pkgs/development
parent961ad6a31402d335b5b4d94d8fbedd71b33203cc (diff)
downloadnixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.tar
nixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.tar.gz
nixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.tar.bz2
nixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.tar.lz
nixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.tar.xz
nixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.tar.zst
nixpkgs-ca73b1fb3396d9f41bccdc2790e3e1f7f7720ee6.zip
* Resolve a collision between OpenSSL and man-pages
  (in ‘share/man/man3/err.3’).

svn path=/nixpkgs/trunk/; revision=31296
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/openssl/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 01f9eca15bb..dd5e03c33f9 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation {
     description = "A cryptographic library that implements the SSL and TLS protocols";
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.simons ];
+    priority = 10; # resolves collision with ‘man-pages’
   };
 }