public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/development/libraries: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-22 00:00:13 +07:00
committed by Jonathan Ringer
parent 046d24424e
commit 66e44425c6
1770 changed files with 4913 additions and 4912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libgcrypt/1.5.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h";
};
patches = stdenv.lib.optionals stdenv.isDarwin [
patches = lib.optionals stdenv.isDarwin [
(fetchpatch {
name = "fix-x86_64-apple-darwin.patch";
sha256 = "138sfwl1avpy19320dbd63mskspc1khlc93j1f1zmylxx3w19csi";
@@ -26,13 +26,13 @@ stdenv.mkDerivation rec {
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postInstall = ''
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
'' + stdenv.lib.optionalString enableCapabilities ''
'' + lib.optionalString enableCapabilities ''
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
'';
doCheck = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.gnu.org/software/libgcrypt/";
description = "General-pupose cryptographic library";
license = licenses.lgpl2Plus;

16
pkgs/development/libraries/libgcrypt/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
, buildPackages
}:
@@ -19,16 +19,16 @@ stdenv.mkDerivation rec {
# The CPU Jitter random number generator must not be compiled with
# optimizations and the optimize -O0 pragma only works for gcc.
# The build enables -O2 by default for everything else.
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
hardeningDisable = lib.optional stdenv.cc.isClang "fortify";
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ libgpgerror ]
++ stdenv.lib.optional stdenv.isDarwin gettext
++ stdenv.lib.optional enableCapabilities libcap;
++ lib.optional stdenv.isDarwin gettext
++ lib.optional enableCapabilities libcap;
configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm";
# Necessary to generate correct assembly when compiling for aarch32 on
# aarch64
@@ -43,20 +43,20 @@ stdenv.mkDerivation rec {
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postFixup = ''
sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
'' + stdenv.lib.optionalString enableCapabilities ''
'' + lib.optionalString enableCapabilities ''
sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
'';
# TODO: figure out why this is even necessary and why the missing dylib only crashes
# random instead of every test
preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
preCheck = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/lib
cp src/.libs/libgcrypt.20.dylib $out/lib
'';
doCheck = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.gnu.org/software/libgcrypt/";
description = "General-purpose cryptographic library";
license = licenses.lgpl2Plus;