Compare commits

...

2 commits

3 changed files with 5 additions and 10 deletions

View file

@ -45,7 +45,6 @@ let
startupWMClass = "com-azefsw-audioconnect-desktop-app-MainKt"; startupWMClass = "com-azefsw-audioconnect-desktop-app-MainKt";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "audiorelay"; pname = "audiorelay";
version = "0.27.5"; version = "0.27.5";
@ -72,16 +71,14 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/share/{applications,pixmaps} install -Dm644 ${desktopItem}/share/applications/audiorelay.desktop $out/share/applications/audiorelay
cp ${desktopItem}/share/applications/audiorelay.desktop $out/share/applications install -Dm644 lib/AudioRelay.png $out/share/pixmaps/audiorelay.png
cp lib/AudioRelay.png $out/share/pixmaps/audiorelay.png
mkdir -p $out/lib install -Dm644 lib/app/audiorelay.jar $out/lib/audiorelay.jar
cp lib/app/audiorelay.jar $out/lib
# Can't use from pkgs since these ones are older and newer fails to load some symbols # Can't use from pkgs since these ones are older and newer fails to load some symbols
cp lib/runtime/lib/libnative-rtaudio.so $out/lib install -D lib/runtime/lib/libnative-rtaudio.so $out/lib/libnative-rtaudio.so
cp lib/runtime/lib/libnative-opus.so $out/lib install -D lib/runtime/lib/libnative-opus.so $out/lib/libnative-opus.so
makeWrapper ${temurin-bin-17}/bin/java $out/bin/audiorelay \ makeWrapper ${temurin-bin-17}/bin/java $out/bin/audiorelay \
--add-flags "-jar $out/lib/audiorelay.jar" \ --add-flags "-jar $out/lib/audiorelay.jar" \

View file

@ -17,7 +17,6 @@ let
++ lib.optional enableNativeOptimizations "-march=native" ++ lib.optional enableNativeOptimizations "-march=native"
++ additionalFlags; ++ additionalFlags;
in in
pkg.overrideAttrs (prevAttrs: { pkg.overrideAttrs (prevAttrs: {
env.NIX_CFLAGS_COMPILE = (prevAttrs.env.NIX_CFLAGS_COMPILE or "") env.NIX_CFLAGS_COMPILE = (prevAttrs.env.NIX_CFLAGS_COMPILE or "")
+ lib.strings.concatStringsSep " " flags; + lib.strings.concatStringsSep " " flags;

View file

@ -45,7 +45,6 @@ let
++ lib.optional enableNoPIC "relocation-model=static" ++ lib.optional enableNoPIC "relocation-model=static"
++ lib.optional enableNativeOptimizations "target-cpu=native"; ++ lib.optional enableNativeOptimizations "target-cpu=native";
in in
pkg.overrideAttrs (finalAttrs: prevAttrs: { pkg.overrideAttrs (finalAttrs: prevAttrs: {
cargoBuildType = "release"; cargoBuildType = "release";