b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

monitor: 0.11.0 -> 0.12.0

Browse source
This commit is contained in:
davidak 2022-01-17 10:59:15 +01:00 committed by Bobby Rong
parent d3dbc7d96d
commit d35021fc31
No known key found for this signature in database
GPG key ID: ED07364437C91161
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/applications/system/monitor/default.nix
View file

@ -18,17 +18,20 @@
, sassc , sassc
, udisks2 , udisks2
, wrapGAppsHook , wrapGAppsHook
, libX11
, libXext
, libXNVCtrl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monitor"; pname = "monitor";
version = "0.11.0"; version = "0.12.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "stsdc"; owner = "stsdc";
repo = "monitor"; repo = "monitor";
rev = version; rev = version;
sha256 = "sha256-xWhhjn7zk/juXx50wLG2TpB5aqU+588kWBBquWrVJbM="; sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -53,8 +56,19 @@ stdenv.mkDerivation rec {
libwnck libwnck
sassc sassc
udisks2 udisks2
libX11
libXext
libXNVCtrl
]; ];
# Force link against Xext, otherwise build fails with:
# ld: /nix/store/...-libXNVCtrl-495.46/lib/libXNVCtrl.a(NVCtrl.o): undefined reference to symbol 'XextAddDisplay'
# ld: /nix/store/...-libXext-1.3.4/lib/libXext.so.6: error adding symbols: DSO missing from command line
# https://github.com/stsdc/monitor/issues/292
NIX_LDFLAGS = "-lXext";
mesonFlags = [ "-Dindicator-wingpanel=enabled" ];
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py
patchShebangs meson/post_install.py patchShebangs meson/post_install.py

4
pkgs/top-level/all-packages.nix
View file

@ -27189,7 +27189,9 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; ocamlPackages = ocaml-ng.ocamlPackages_4_01_0;
}; };
monitor = callPackage ../applications/system/monitor { }; monitor = callPackage ../applications/system/monitor {
libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
};
moolticute = libsForQt5.callPackage ../applications/misc/moolticute { }; moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };