diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-14 06:03:25 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-14 14:32:26 +0200 |
| commit | 2490848627b43c8393563b8ee50042cc8356a7f2 (patch) | |
| tree | bcc340a4a8118be56f3e5aba6c3897782c601baa | |
| parent | 86cc3d32ac4df74b68cbe0ff7649b5885c0346f2 (diff) | |
| download | nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.tar nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.tar.gz nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.tar.bz2 nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.tar.lz nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.tar.xz nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.tar.zst nixlib-2490848627b43c8393563b8ee50042cc8356a7f2.zip | |
polkit: split dev and bin outputs
| -rw-r--r-- | nixos/modules/security/polkit.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/polkit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 95b659d96f0f..d23a0baaed02 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -90,7 +90,7 @@ in owner = "root"; group = "root"; setuid = true; - source = "${pkgs.polkit}/lib/polkit-1/polkit-agent-helper-1"; + source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; } ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index cdeaa0cb1d96..5744460008fd 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; }; + outputs = [ "dev" "out" "bin" ]; # small man pages in $bin + buildInputs = [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2d9f2070c251..aa15f397f8ac 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit}/bin/pkttyagent here because that would + [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would # lead to a cyclic dependency. "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" "-fno-stack-protector" |