uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
36
pkgs/development/libraries/libsodium/default.nix
Normal file
36
pkgs/development/libraries/libsodium/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, stdenv, fetchurl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsodium";
|
||||
version = "1.0.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.libsodium.org/libsodium/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1h9ncvj23qbbni958knzsli8dvybcswcjbx0qjjgi922nf848l3g";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch;
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook;
|
||||
|
||||
separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector";
|
||||
|
||||
# FIXME: the hardeingDisable attr above does not seems effective, so
|
||||
# the need to disable stackprotector via configureFlags
|
||||
configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modern and easy-to-use crypto library";
|
||||
homepage = "http://doc.libsodium.org/";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
15
pkgs/development/libraries/libsodium/mingw-no-fortify.patch
Normal file
15
pkgs/development/libraries/libsodium/mingw-no-fortify.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff -Naur libsodium-1.0.18-orig/configure.ac libsodium-1.0.18/configure.ac
|
||||
--- libsodium-1.0.18-orig/configure.ac 2019-05-30 16:20:24.000000000 -0400
|
||||
+++ libsodium-1.0.18/configure.ac 2021-08-11 08:09:54.653907245 -0400
|
||||
@@ -217,11 +217,6 @@
|
||||
|
||||
AC_CHECK_DEFINE([__wasi__], [WASI="yes"], [])
|
||||
|
||||
-AC_CHECK_DEFINE([_FORTIFY_SOURCE], [], [
|
||||
- AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2],
|
||||
- [CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"])
|
||||
-])
|
||||
-
|
||||
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],
|
||||
[CFLAGS="$CFLAGS -fvisibility=hidden"])
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue