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:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,73 @@
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8
# Optional, Jitsi still runs without, but you may pass null:
, alsa-lib, dbus, gtk2, libpulseaudio, openssl, xorg
}:
let jdk = jdk8; in
stdenv.mkDerivation rec {
pname = "jitsi";
version = "2.10.5550";
src = fetchurl {
url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
};
patches = [ ./jitsi.patch ];
jitsiItem = makeDesktopItem {
name = "Jitsi";
exec = "jitsi";
comment = "VoIP and Instant Messaging client";
desktopName = "Jitsi";
genericName = "Instant Messaging";
categories = [ "Chat" ];
};
libPath = lib.makeLibraryPath ([
stdenv.cc.cc # For libstdc++.
alsa-lib
dbus
gtk2
libpulseaudio
openssl
xorg.libX11
xorg.libXext
xorg.libXScrnSaver
xorg.libXv
]);
nativeBuildInputs = [ unzip ];
buildInputs = [ ant jdk ];
buildPhase = "ant make";
installPhase = ''
mkdir -p $out
cp -a lib $out/
rm -rf $out/lib/native/solaris
cp -a sc-bundles $out/
mkdir $out/bin
cp resources/install/generic/run.sh $out/bin/jitsi
chmod +x $out/bin/jitsi
substituteInPlace $out/bin/jitsi \
--subst-var-by JAVA ${jdk}/bin/java \
--subst-var-by EXTRALIBS ${gtk2.out}/lib
sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi
patchShebangs $out
libPath="$libPath:${jdk.home}/lib/${jdk.architecture}"
find $out/ -type f -name '*.so' | while read file; do
patchelf --set-rpath "$libPath" "$file" && \
patchelf --shrink-rpath "$file"
done
'';
meta = with lib; {
homepage = "https://jitsi.org/";
description = "Open Source Video Calls and Chat";
sourceProvenance = with sourceTypes; [ binaryBytecode ];
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = teams.jitsi.members;
};
}

View file

@ -0,0 +1,27 @@
--- /home/dario/Downloads/jitsi/resources/install/generic/run.sh 2013-11-01 15:37:21.000000000 +0000
+++ jitsi/resources/install/generic/run.sh 2014-03-04 11:52:30.796397567 +0000
@@ -1,4 +1,9 @@
-mkdir -p $HOME/.sip-communicator/log
+#! /bin/bash
+# A modified version of the generic run.sh
+
+#mkdir -p $HOME/.sip-communicator/log
+
+cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
# Get architecture
ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
@@ -6,10 +11,12 @@
# Additionnal JVM arguments
CLIENTARGS=""
+NATIVELIBS="lib/native/linux-64"
if [ $ARCH = 32 ]
then
CLIENTARGS="-client -Xmx256m"
+ NATIVELIBS="lib/native/linux"
fi
export PATH=$PATH:native
-java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
+LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator