diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 049c96c54e7..5f46e2f1ef8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -77,7 +77,7 @@ in { services.gnome3.tracker.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; services.telepathy.enable = mkDefault true; - networking.networkmanager.enable = true; + networking.networkmanager.enable = mkDefault true; services.upower.enable = config.powerManagement.enable; services.upower.package = gnome3.upower; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix new file mode 100644 index 00000000000..52a1baa05a6 --- /dev/null +++ b/pkgs/tools/networking/cmst/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchgit, qt5, makeWrapper, libX11 }: + +stdenv.mkDerivation rec { + name = "cmst-2014.08.23"; + rev = "refs/tags/${name}"; + src = fetchgit { + url = "git://github.com/andrew-bibb/cmst.git"; + inherit rev; + sha256 = "07g5i929jxlh6vm0ad8x33qmf2sryiichlv37x7fpn20h3xcsia0"; + }; + + buildInputs = [ qt5 makeWrapper ]; + + configurePhase = '' + substituteInPlace ./cmst.pro \ + --replace "/usr/bin" "$out/bin" \ + --replace "/usr/share" "$out/usr/share" + ''; + + buildPhase = '' + qmake PREFIX=$out + make + ''; + + postInstall = '' + wrapProgram $out/bin/cmst \ + --prefix "QTCOMPOSE" ":" "${libX11}/share/X11/locale" + ''; + + meta = { + description = "QT GUI for Connman with system tray icon"; + homepage = "https://github.com/andrew-bibb/cmst"; + maintainers = [ stdenv.lib.maintainers.matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a2323adf94..6fd4c784c25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -780,6 +780,8 @@ let ciopfs = callPackage ../tools/filesystems/ciopfs { }; + cmst = callPackage ../tools/networking/cmst { }; + colord = callPackage ../tools/misc/colord { }; colord-gtk = callPackage ../tools/misc/colord-gtk { };