[NixOS] Reenable lxqt powermanagement, remove custom gitter

This commit is contained in:
Ivan Malison 2018-08-27 14:46:20 -07:00
parent 0123b6a5d1
commit 0388ecbc49
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 2 additions and 79 deletions

View File

@ -85,6 +85,7 @@ in
termite termite
vlc vlc
xfce.thunar xfce.thunar
wire-desktop
# Appearance # Appearance
numix-icon-theme-circle numix-icon-theme-circle
@ -103,8 +104,7 @@ in
gnome3.gpaste gnome3.gpaste
kdeconnect kdeconnect
libnotify libnotify
# XXX: renable this lxqt.lxqt-powermanagement
# lxqt.lxqt-powermanagement
networkmanagerapplet networkmanagerapplet
customizable-notify-osd customizable-notify-osd
pasystray-appindicator pasystray-appindicator

View File

@ -1,76 +0,0 @@
{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
, fontconfig, freetype, gdk_pixbuf, glib, gnome3, gtk3, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
, nwjs, pango, systemd }:
let gitterDirectorySuffix = "opt/gitter";
doELFExePatch = target: ''
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
--set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
$out/${gitterDirectorySuffix}/${target}
'';
doELFLibPatch = target: ''
patchelf --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
$out/${gitterDirectorySuffix}/${target}
'';
libPath = stdenv.lib.makeLibraryPath [
alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib
gnome3.gconf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
];
in stdenv.mkDerivation rec {
pname = "gitter";
version = "4.1.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi";
};
nativeBuildInputs = [ makeWrapper dpkg ];
unpackPhase = "dpkg -x $src .";
installPhase = ''
mkdir -p $out/{bin,opt/gitter,share/pixmaps}
mv ./opt/Gitter/linux64/* $out/opt/gitter
${doELFExePatch "Gitter"}
${doELFExePatch "nacl_helper"}
${doELFExePatch "minidump_stackwalk"}
${doELFExePatch "nwjc"}
${doELFExePatch "chromedriver"}
${doELFExePatch "payload"}
${doELFLibPatch "lib/libnw.so"}
${doELFLibPatch "lib/libnode.so"}
${doELFLibPatch "lib/libffmpeg.so"}
wrapProgram $out/${gitterDirectorySuffix}/Gitter --prefix LD_LIBRARY_PATH : ${libPath}
ln -s $out/${gitterDirectorySuffix}/Gitter $out/bin/
ln -s $out/${gitterDirectorySuffix}/logo.png $out/share/pixmaps/gitter.png
ln -s "${desktopItem}/share/applications" $out/share/
'';
desktopItem = makeDesktopItem {
name = pname;
exec = "/usr/bin/env Gitter";
icon = pname;
desktopName = "Gitter";
genericName = meta.description;
categories = "Network;InstantMessaging;";
};
meta = with stdenv.lib; {
description = "Where developers come to talk";
downloadPage = "https://gitter.im/apps";
license = licenses.mit;
maintainers = [ maintainers.imalison ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -1,7 +1,6 @@
self: super: self: super:
{ {
gitter = super.callPackage ./gitter.nix { };
clipit = super.clipit.overrideAttrs (oldAttrs: rec { clipit = super.clipit.overrideAttrs (oldAttrs: rec {
version = "50d983514386029a1f133187902084b753458f32"; version = "50d983514386029a1f133187902084b753458f32";
preConfigure = "./autogen.sh"; preConfigure = "./autogen.sh";