Unverified Commit 45cef8da authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

Merge pull request #315535 from NixOS/backport-315117-to-release-24.05 

[Backport release-24.05] lomiri.*: Make buildable while waiting for GLib fix
parents 9600c693 bbae47b2

nixos/modules/services/desktop-managers/lomiri.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ in { 
        morph-browser

        qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session

        suru-icon-theme

        telephony-service

        # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

      ]);

    };
@@ -75,7 +75,7 @@ in { 
        ayatana-indicator-power

        ayatana-indicator-session

      ]) ++ (with pkgs.lomiri; [

        telephony-service

        # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

      ] ++ lib.optionals config.networking.networkmanager.enable [

        lomiri-indicator-network

      ]);

nixos/tests/ayatana-indicators.nix

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ in { 
        ayatana-indicator-session

      ] ++ (with pkgs.lomiri; [

        lomiri-indicator-network

        telephony-service

        # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

      ]);

    };

pkgs/desktops/lomiri/applications/lomiri/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { 
    lomiri-settings-components

    lomiri-thumbnailer

    qtmultimedia

    telephony-service

    # telephony-service # currently broken: https://github.com/NixOS/nixpkgs/pull/314043

  ];



  nativeCheckInputs = [

pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379

  ];



  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

  # Currently broken: https://github.com/NixOS/nixpkgs/pull/314043

  doCheck = false;



  postInstall = ''

    substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \

pkgs/desktops/lomiri/services/telephony-service/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -197,5 +197,7 @@ stdenv.mkDerivation (finalAttrs: { 
    license = licenses.gpl3Only;

    maintainers = teams.lomiri.members;

    platforms = platforms.linux;

    # Completely broken until https://github.com/NixOS/nixpkgs/pull/314043 is merged

    broken = true;

  };

})