Unverified Commit 9c3c35d2 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

buildFlutterApplication: prevent conflicting app directories (#345404)

parents b5bfd402 10bf5e1c

pkgs/applications/misc/yubioath-flutter/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -43,21 +43,21 @@ flutter324.buildFlutterApplication rec { 


  postInstall = ''

    # Swap the authenticator-helper symlink with the correct symlink.

    ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper"

    ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper"



    # Move the icon.

    mkdir $out/share/icons

    mv $out/app/linux_support/com.yubico.yubioath.png $out/share/icons

    mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/icons



    # Cleanup.

    rm -rf \

      "$out/app/README.adoc" \

      "$out/app/desktop_integration.sh" \

      "$out/app/linux_support" \

      "$out/app/$pname/README.adoc" \

      "$out/app/$pname/desktop_integration.sh" \

      "$out/app/$pname/linux_support" \

      $out/bin/* # We will repopulate this directory later.



    # Symlink binary.

    ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter"

    ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter"



    # Set the correct path to the binary in desktop file.

    substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \

pkgs/by-name/fi/finamp/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ flutter324.buildFlutterApplication { 
  };



  postFixup = ''

    patchelf $out/app/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]}

    patchelf $out/app/$pname/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]}

  '';



  postInstall = ''

pkgs/by-name/in/intiface-central/package.nix

+4 −2
Original line number Diff line number Diff line
@@ -50,11 +50,13 @@ flutterPackages.v3_19.buildFlutterApplication rec { 


  # without this, only the splash screen will be shown and the logs will contain the

  # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'`

  extraWrapProgramArgs = "--chdir $out/app";

  # Environmental variables don't quite eval outside of hooks so use pname and

  # version directly.

  extraWrapProgramArgs = "--chdir $out/app/${pname}";



  postInstall = ''

    mkdir -p $out/share/pixmaps

    cp $out/app/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png

    cp $out/app/$pname/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png

  '';



  desktopItems = [

pkgs/desktops/expidus/calculator/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ flutter.buildFlutterApplication rec { 


  postInstall = ''

    rm $out/bin/calculator

    ln -s $out/app/calculator $out/bin/expidus-calculator

    ln -s $out/app/$pname/calculator $out/bin/expidus-calculator



    mkdir -p $out/share/applications

    mv $out/app/data/com.expidusos.calculator.desktop $out/share/applications

    mv $out/app/$pname/data/com.expidusos.calculator.desktop $out/share/applications



    mkdir -p $out/share/icons

    mv $out/app/data/com.expidusos.calculator.png $out/share/icons

    mv $out/app/$pname/data/com.expidusos.calculator.png $out/share/icons



    mkdir -p $out/share/metainfo

    mv $out/app/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo

    mv $out/app/$pname/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo



    substituteInPlace "$out/share/applications/com.expidusos.calculator.desktop" \

      --replace "Exec=calculator" "Exec=$out/bin/expidus-calculator" \

pkgs/desktops/expidus/file-manager/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -23,16 +23,16 @@ flutter.buildFlutterApplication rec { 


  postInstall = ''

    rm $out/bin/file_manager

    ln -s $out/app/file_manager $out/bin/expidus-file-manager

    ln -s $out/app/$pname/file_manager $out/bin/expidus-file-manager



    mkdir -p $out/share/applications

    mv $out/app/data/com.expidusos.file_manager.desktop $out/share/applications

    mv $out/app/$pname/data/com.expidusos.file_manager.desktop $out/share/applications



    mkdir -p $out/share/icons

    mv $out/app/data/com.expidusos.file_manager.png $out/share/icons

    mv $out/app/$pname/data/com.expidusos.file_manager.png $out/share/icons



    mkdir -p $out/share/metainfo

    mv $out/app/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo

    mv $out/app/$pname/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo



    substituteInPlace "$out/share/applications/com.expidusos.file_manager.desktop" \

      --replace "Exec=file_manager" "Exec=$out/bin/expidus-file-manager" \