Compare commits

..

No commits in common. "a563b7c06a265eafda4b904b8be0e2c4ae8b8907" and "506c72254b4096e931d21a73600b962c27f06289" have entirely different histories.

3 changed files with 10 additions and 5 deletions

View file

@ -45,6 +45,7 @@ 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";
@ -71,14 +72,16 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm644 ${desktopItem}/share/applications/audiorelay.desktop $out/share/applications/audiorelay mkdir -p $out/share/{applications,pixmaps}
install -Dm644 lib/AudioRelay.png $out/share/pixmaps/audiorelay.png cp ${desktopItem}/share/applications/audiorelay.desktop $out/share/applications
cp lib/AudioRelay.png $out/share/pixmaps/audiorelay.png
install -Dm644 lib/app/audiorelay.jar $out/lib/audiorelay.jar mkdir -p $out/lib
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
install -D lib/runtime/lib/libnative-rtaudio.so $out/lib/libnative-rtaudio.so cp lib/runtime/lib/libnative-rtaudio.so $out/lib
install -D lib/runtime/lib/libnative-opus.so $out/lib/libnative-opus.so cp lib/runtime/lib/libnative-opus.so $out/lib
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,6 +17,7 @@ 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,6 +45,7 @@ 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";