diff options
| author | Alexander V. Nikolaev <avn@avnik.info> | 2018-07-12 20:01:08 +0300 |
|---|---|---|
| committer | Alexander V. Nikolaev <avn@avnik.info> | 2018-08-08 13:38:40 +0300 |
| commit | 5a59d5e13143129e3e4f6f801874286781efac60 (patch) | |
| tree | f05fbcae7a7fea05b523c88530cb06fd41213dca /pkgs/development/libraries/kerberos | |
| parent | 0a72127d57472069b12b080cd89d79917ac54bfe (diff) | |
| download | nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.tar nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.tar.gz nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.tar.bz2 nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.tar.lz nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.tar.xz nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.tar.zst nixpkgs-5a59d5e13143129e3e4f6f801874286781efac60.zip | |
heimdal: simplify build, keep bin/ in $out
Diffstat (limited to 'pkgs/development/libraries/kerberos')
| -rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 11f0ffdad16..5b92458d89e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; }; - outputs = [ "out" "bin" "dev" "man" "info" ]; + outputs = [ "out" "dev" "man" "info" ]; patches = [ ./heimdal-make-missing-headers.patch ]; @@ -53,9 +53,9 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlagsArray+=( - "--bindir=$out/bin" # Put binaries to $out, then move them to $bin, - # otherwise we go a cyclic dependecny + "--bindir=$out/bin" "--sbindir=$out/sbin" + "--libexecdir=$out/libexec/heimdal" "--mandir=$man/share/man" "--infodir=$man/share/info" "--includedir=$dev/include") @@ -75,18 +75,12 @@ stdenv.mkDerivation rec { # Do we need it? rm $out/bin/su - # Doesn't succeed with --libexec=$out/sbin, so mkdir -p $dev/bin - mkdir -p $bin/{,s}bin - mv "$out/libexec/heimdal/"* $dev/bin/ - rmdir $out/libexec/heimdal - mv "$out/libexec/"* $bin/sbin/ - rmdir $out/libexec + mv $out/bin/krb5-config $dev/bin/ - mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/ - - # Move remaining binaries to $bin - mv $out/bin/* $bin/bin/ + # asn1 compilers, move them to $dev + mv $out/libexec/heimdal/heimdal/* $dev/bin + rmdir $out/libexec/heimdal/heimdal ''; # Issues with hydra |