From ade842f51a709e542872dce24fcbe20aa993dff7 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Thu, 1 Mar 2018 09:20:51 +0000 Subject: [PATCH] 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. --- nixos/tests/kerberos/mit.nix | 1 - pkgs/development/libraries/kerberos/krb5.nix | 2 +- 2 files changed, 1 insertion(+), 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;