From c270663fec4fc43bc56a3b106944d7f3ca32df8d Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 18 May 2010 16:40:17 +0000 Subject: [PATCH] Move polkit-1 libexec files into libexec/polkit-1/ svn path=/nixpkgs/trunk/; revision=21842 --- pkgs/development/libraries/polkit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 81d35a655502..0e4b6cab6502 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -6,7 +6,7 @@ let foolVars = { LOCALSTATE = "/var"; SYSCONF = "/etc"; - LIBEXEC = "${system}/libexec"; + LIBEXEC = "${system}/libexec/polkit-1"; LIB = "${system}/lib"; DATA = "${system}/share"; }; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext gobjectIntrospection ]; + preConfigure='' + configureFlags="--libexecdir=$out/libexec/polkit-1" + ''; + # Ugly hack to overwrite hardcoded directories # TODO: investigate a proper patch which will be accepted upstream CFLAGS = stdenv.lib.concatStringsSep " "