diff options
| author | davidak <git@davidak.de> | 2022-01-17 10:59:15 +0100 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-01-18 22:06:43 +0800 |
| commit | d35021fc314ffe4a197f13b21743569bb16498bb (patch) | |
| tree | 45c1765ab23c8bf96684782f361e55bb0eaf9fac /pkgs/applications/system | |
| parent | d3dbc7d96dddc186dbcf3f1e2ce39d64daab6a8b (diff) | |
monitor: 0.11.0 -> 0.12.0
Diffstat (limited to 'pkgs/applications/system')
| -rw-r--r-- | pkgs/applications/system/monitor/default.nix | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 6b535e5ad418..653d727525e8 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -18,17 +18,20 @@ , sassc , udisks2 , wrapGAppsHook +, libX11 +, libXext +, libXNVCtrl }: stdenv.mkDerivation rec { pname = "monitor"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-xWhhjn7zk/juXx50wLG2TpB5aqU+588kWBBquWrVJbM="; + sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7"; fetchSubmodules = true; }; @@ -53,8 +56,19 @@ stdenv.mkDerivation rec { libwnck sassc 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 = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py |