Author: eelco
Date: Mon Aug 22 11:45:51 2011
New Revision: 28733
URL: https://svn.nixos.org/websvn/nix/?rev=28733&sc=1
Log:
* Polkit: look for ‘polkit-agent-helper-1’ in the right location (for
NixOS, that is), i.e., /var/setuid-wrappers.
Modified:
nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix Mon Aug 22
06:54:03 2011 (r28732)
+++ nixpkgs/trunk/pkgs/development/libraries/polkit/default.nix Mon Aug 22
11:45:51 2011 (r28733)
@@ -33,6 +33,15 @@
( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var
foolVars}"\"'')
(builtins.attrNames foolVars) );
+ preBuild =
+ ''
+ # ‘libpolkit-agent-1.so’ should call the setuid wrapper on
+ # NixOS. Hard-coding the path is kinda ugly. Maybe we can just
+ # call through $PATH, but that might have security implications.
+ substituteInPlace src/polkitagent/polkitagentsession.c \
+ --replace PACKAGE_LIBEXEC_DIR '"/var/setuid-wrappers"'
+ '';
+
makeFlags =
''
INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
