about summary refs log tree commit diff
path: root/pkgs/tools/X11
diff options
context:
space:
mode:
authorJack Kelly <jack@jackkelly.name>2019-05-20 18:37:11 +1000
committerJack Kelly <jack@jackkelly.name>2019-05-20 22:23:22 +1000
commit1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3 (patch)
treeb981e743c2db280bdb0d9b12c090d7dae7f399a9 /pkgs/tools/X11
parent75bc4369eefab3157613ed4a46194d5035e35a48 (diff)
downloadnixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.tar
nixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.tar.gz
nixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.tar.bz2
nixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.tar.lz
nixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.tar.xz
nixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.tar.zst
nixlib-1c3aa30c3d812cea7127cfa4be6763c19d4b7eb3.zip
arandr: Use wrapGAppsHook
This stops arandr from crashing if it tries to open a dialog box.

Note: the hook doesn't play nicely with gobject-introspection unless
strictDeps = false. See NixOS#56943.
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r--pkgs/tools/X11/arandr/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix
index 5baba1171571..51f2f5ec2494 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, gobject-introspection, gtk3, xrandr, python3Packages }:
+{ stdenv, fetchurl, python3Packages
+, gobject-introspection, gsettings-desktop-schemas, gtk3
+, wrapGAppsHook, xrandr
+}:
 
 let
   inherit (python3Packages) buildPythonApplication docutils pygobject3;
@@ -17,13 +20,13 @@ in buildPythonApplication rec {
   # no tests
   doCheck = false;
 
-  buildInputs = [ docutils ];
-  nativeBuildInputs = [ gobject-introspection gtk3 ];
-  propagatedBuildInputs = [ xrandr pygobject3 ];
+  # hook for gobject-introspection doesn't like strictDeps
+  # https://github.com/NixOS/nixpkgs/issues/56943
+  strictDeps = false;
 
-  makeWrapperArgs = [
-    "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
-  ];
+  buildInputs = [ docutils gsettings-desktop-schemas gtk3 ];
+  nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
+  propagatedBuildInputs = [ xrandr pygobject3 ];
 
   meta = {
     homepage = http://christian.amsuess.com/tools/arandr/;