diff options
author | Kai Wohlfahrt <kai.scorpio@gmail.com> | 2018-03-01 09:20:51 +0000 |
---|---|---|
committer | Kai Wohlfahrt <kai@prodo.ai> | 2018-12-11 13:33:10 +0000 |
commit | ade842f51a709e542872dce24fcbe20aa993dff7 (patch) | |
tree | 0322ddc58dda6ea34a87cdaec71fb297b42a4059 | |
parent | d752677b1b2b8af93b1a6dc0532826aa29e1827f (diff) | |
download | nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.tar nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.tar.gz nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.tar.bz2 nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.tar.lz nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.tar.xz nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.tar.zst nixlib-ade842f51a709e542872dce24fcbe20aa993dff7.zip |
kerberos: move user binaries to default output
The intention of the previous change was to move krb5-config to .dev (it gives the locations of headers), but it grabbed all of the user-facing binaries too. This puts them back.
-rw-r--r-- | nixos/tests/kerberos/mit.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/kerberos/krb5.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/tests/kerberos/mit.nix b/nixos/tests/kerberos/mit.nix index df13992a8360..6da3a384aa99 100644 --- a/nixos/tests/kerberos/mit.nix +++ b/nixos/tests/kerberos/mit.nix @@ -21,7 +21,6 @@ import ../make-test.nix ({pkgs, ...}: { }; }; users.extraUsers.alice = { isNormalUser = true; }; - environment.systemPackages = [ pkgs.krb5Full.dev ]; }; testScript = '' diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 165f9139ff1f..50a669b053f9 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { # not via outputBin, due to reference from libkrb5.so postInstall = '' - moveToOutput bin "$dev" + moveToOutput bin/krb5-config "$dev" ''; enableParallelBuilding = true; |