Unverified Commit 977820dc authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

flutterPackages: refactor (#500309)

parents 21601ecc fe90d5a6

ci/OWNERS

+1 −2
Original line number Diff line number Diff line
@@ -469,9 +469,8 @@ nixos/tests/incus/ @adamcstephens 
pkgs/by-name/in/incus/                  @adamcstephens

pkgs/by-name/lx/lxc*                    @adamcstephens



# ExpidusOS, Flutter

# Flutter

/pkgs/development/compilers/flutter @RossComputerGuy

/pkgs/desktops/expidus              @RossComputerGuy



# GNU Tar & Zip

/pkgs/tools/archivers/gnutar        @RossComputerGuy

pkgs/build-support/dart/build-dart-application/default.nix

+0 −6
Original line number Diff line number Diff line
@@ -194,16 +194,10 @@ lib.extendMkDerivation { 
          # Ensure that we inherit the propagated build inputs from the dependencies.

          builtins.attrValues pubspecLockData.dependencySources;



      preConfigure = args.preConfigure or "" + ''

        ln -sf "$pubspecLockFilePath" pubspec.lock

      '';



      # When stripping, it seems some ELF information is lost and the dart VM cli

      # runs instead of the expected program. Don't strip if it's an exe output.

      dontStrip = args.dontStrip or (dartOutputType == "exe");



      passAsFile = [ "pubspecLockFile" ];



      passthru = {

        pubspecLock = pubspecLockData;

      }

pkgs/desktops/expidus/calculator/default.nix

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
{

  lib,

  flutter,

  fetchFromGitHub,

}:

flutter.buildFlutterApplication rec {

  pname = "expidus-calculator";

  version = "0.1.1-alpha";



  src = fetchFromGitHub {

    owner = "ExpidusOS";

    repo = "calculator";

    rev = version;

    hash = "sha256-O3LHp10Fo3PW3zoN7mFSQEKh+AAaR+IqkRtc6nQrIZE=";

  };



  flutterBuildFlags = [

    "--dart-define=COMMIT_HASH=a5d8f54404b9994f83beb367a1cd11e04a6420cb"

  ];



  pubspecLock = lib.importJSON ./pubspec.lock.json;



  gitHashes = {

    libtokyo = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";

    libtokyo_flutter = "sha256-T0+vyfSfijLv7MvM+zt3bkVpb3aVrlDnse2xyNMp9GU=";

  };



  postInstall = ''

    rm $out/bin/calculator

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



    mkdir -p $out/share/applications

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



    mkdir -p $out/share/icons

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



    mkdir -p $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" \

      --replace "Icon=com.expidusos.calculator" "Icon=$out/share/icons/com.expidusos.calculator.png"

  '';



  meta = {

    broken = true;

    description = "ExpidusOS Calculator";

    homepage = "https://expidusos.com";

    license = lib.licenses.gpl3Only;

    maintainers = with lib.maintainers; [ RossComputerGuy ];

    platforms = [

      "x86_64-linux"

      "aarch64-linux"

    ];

    mainProgram = "expidus-calculator";

  };

}

pkgs/desktops/expidus/calculator/pubspec.lock.json

deleted100644 → 0
+0 −790

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/desktops/expidus/default.nix

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
{ callPackage, flutterPackages }:

{

  calculator = callPackage ./calculator {

    flutter = flutterPackages.v3_35;

  };



  file-manager = callPackage ./file-manager {

    flutter = flutterPackages.v3_35;

  };

}