Merge pull request #98129 from demyanrogozhin/react-native-debugger-fix

react-native-debugger: 0.9.10 -> 0.11.4
This commit is contained in:
Maximilian Bosch 2020-09-17 14:49:08 +02:00 committed by GitHub
commit 85ca7f75fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib { stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core
, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
}: }:
let let
@ -10,7 +10,7 @@ let
fontconfig fontconfig
pango pango
atk atk
gtk2 gtk3
glib glib
freetype freetype
dbus dbus
@ -20,8 +20,8 @@ let
cups cups
expat expat
udev udev
at-spi2-atk
gnome2.GConf at-spi2-core
xorg.libX11 xorg.libX11
xorg.libXcursor xorg.libXcursor
@ -38,11 +38,10 @@ let
]; ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "react-native-debugger"; pname = "react-native-debugger";
version = "0.9.10"; version = "0.11.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip";
sha256 = "158275sp37smc8lnrcbj56lp7aa6fj9gzb6fzjgz9r980qgzhia6"; sha256 = "1dnlxdqcn90r509ff5003fibkrprdr0ydpnwg5p0xzs6rz3k8698";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];
@ -52,15 +51,15 @@ in stdenv.mkDerivation rec {
unzip $src -d $out unzip $src -d $out
mkdir $out/{lib,bin,share} mkdir $out/{lib,bin,share}
mv $out/lib{node,ffmpeg}.so $out/lib mv $out/{libEGL,libGLESv2,libvk_swiftshader,libffmpeg}.so $out/lib
mv $out/!(lib|share|bin) $out/share mv $out/!(lib|share|bin) $out/share
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath ${rpath}:$out/lib \ --set-rpath ${rpath}:$out/lib \
$out/share/React\ Native\ Debugger $out/share/react-native-debugger
ln -s $out/share/React\ Native\ Debugger $out/bin/React\ Native\ Debugger ln -s $out/share/react-native-debugger $out/bin/react-native-debugger
install -Dm644 "${desktopItem}/share/applications/"* \ install -Dm644 "${desktopItem}/share/applications/"* \
-t $out/share/applications/ -t $out/share/applications/
@ -68,10 +67,10 @@ in stdenv.mkDerivation rec {
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "rndebugger"; name = "rndebugger";
exec = "React\\ Native\\ Debugger"; exec = "react-native-debugger";
desktopName = "React Native Debugger"; desktopName = "React Native Debugger";
genericName = "React Native Debugger"; genericName = "React Native Debugger";
categories = "Development;Tools;"; categories = "Development;Debugger;";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {