nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 11:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

update inputs and copyrights to 24.05

Browse source 
Co-authored-by: Alexander Sosedkin <monk@unboiled.info>
This commit is contained in:
Sergey Volkov 2024-06-05 18:03:25 +02:00 • committed by Alexander Sosedkin
parent e0216d3e47
commit 4d20bfc846
33 changed files with 77 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/cross-compiling/compiler-rt.patch
View file

@ -1,9 +1,8 @@
diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/d
evelopment/compilers/llvm/16/compiler-rt/default.nix
index 0f15a9e12cde..a32533e5285c 100644
--- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix
@@ -130,8 +130,8 @@ stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 7d47436b714f..d30df471e92a 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -155,8 +155,8 @@ stdenv.mkDerivation ({
# The presence of crtbegin_shared has been added and removed; it's possible
# people have added/removed it to get it working on their platforms.
# Try each in turn for now.

22
pkgs/cross-compiling/libunwind.patch
View file

@ -1,13 +1,13 @@
diff --git a/pkgs/development/compilers/llvm/16/libunwind/default.nix b/pkgs/development/compilers/llvm/16/libunwind/default.nix
index 1b677a7a2c0d..6c16e869a085 100644
--- a/pkgs/development/compilers/llvm/16/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/16/libunwind/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ninja python3 ];
diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
index 515914e6acb6..ca53043bd278 100644
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation (rec {
ninja python3
];
+ LDFLAGS = "-unwindlib=none";
+
cmakeFlags = [
"-DLLVM_ENABLE_RUNTIMES=libunwind"
] ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
cmakeFlags = lib.optional (lib.versionAtLeast release_version "15") "-DLLVM_ENABLE_RUNTIMES=libunwind"
++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";

2
pkgs/cross-compiling/talloc-static.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
{ callPackage
, fetchurl

2
pkgs/default.nix
View file

@ -37,7 +37,7 @@ let
pkgs = pkgs.lib.mkForce pkgs; # to override ./modules/nixpkgs/config.nix
};
system.stateVersion = "23.11";
system.stateVersion = "24.05";
# Fix invoking bash after initial build.
user.shell = "${initialPackageInfo.bash}/bin/bash";

2
pkgs/proot-termux/default.nix
View file

@ -1,4 +1,4 @@
# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
# Copyright (c) 2019-2024, see AUTHORS. Licensed under MIT License, see LICENSE.
{ stdenv
, fetchFromGitHub