nixpatches: remove upstreamed "allow i2p to build on aarch64" patch
This commit is contained in:
parent
1579e089e9
commit
a4dbf18d7a
|
@ -1,26 +0,0 @@
|
|||
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
|
||||
index e835007fdc5..1406486c7d4 100644
|
||||
--- a/pkgs/tools/networking/i2p/default.nix
|
||||
+++ b/pkgs/tools/networking/i2p/default.nix
|
||||
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
||||
binaryBytecode # source bundles dependencies as jars
|
||||
];
|
||||
license = licenses.gpl2;
|
||||
- platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
+ platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
maintainers = with maintainers; [ joelmo ];
|
||||
};
|
||||
}
|
||||
diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix
|
||||
index 93d86a75d18..ab563085f93 100644
|
||||
--- a/pkgs/tools/system/java-service-wrapper/default.nix
|
||||
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
|
||||
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://wrapper.tanukisoftware.com/";
|
||||
changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${version}";
|
||||
license = licenses.gpl2Only;
|
||||
- platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
+ platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
|
||||
maintainers = [ maintainers.suhr ];
|
||||
};
|
||||
}
|
|
@ -152,8 +152,6 @@ in [
|
|||
# hash = "sha256-eTwEbVULYjmOW7zUFcTUqvBZqUFjHTKFhvmU2m3XQeo=";
|
||||
# })
|
||||
|
||||
# ./2022-12-19-i2p-aarch64.patch
|
||||
|
||||
# let ccache cross-compile
|
||||
# ./2023-03-04-ccache-cross-fix.patch
|
||||
|
||||
|
|
Loading…
Reference in New Issue