public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

heimdal: simplify build, keep bin/ in $out

Browse Source
This commit is contained in:
Alexander V. Nikolaev 2018-07-12 20:01:08 +03:00
parent 0a72127d57
commit 5a59d5e131
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/kerberos/heimdal.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d"; sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
}; };
outputs = [ "out" "bin" "dev" "man" "info" ]; outputs = [ "out" "dev" "man" "info" ];
patches = [ ./heimdal-make-missing-headers.patch ]; patches = [ ./heimdal-make-missing-headers.patch ];
@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
configureFlagsArray+=( configureFlagsArray+=(
"--bindir=$out/bin" # Put binaries to $out, then move them to $bin, "--bindir=$out/bin"
# otherwise we go a cyclic dependecny
"--sbindir=$out/sbin" "--sbindir=$out/sbin"
"--libexecdir=$out/libexec/heimdal"
"--mandir=$man/share/man" "--mandir=$man/share/man"
"--infodir=$man/share/info" "--infodir=$man/share/info"
"--includedir=$dev/include") "--includedir=$dev/include")
@ -75,18 +75,12 @@ stdenv.mkDerivation rec {
# Do we need it? # Do we need it?
rm $out/bin/su rm $out/bin/su
# Doesn't succeed with --libexec=$out/sbin, so
mkdir -p $dev/bin mkdir -p $dev/bin
mkdir -p $bin/{,s}bin mv $out/bin/krb5-config $dev/bin/
mv "$out/libexec/heimdal/"* $dev/bin/
rmdir $out/libexec/heimdal
mv "$out/libexec/"* $bin/sbin/
rmdir $out/libexec
mkdir -p $dev/bin && mv $out/bin/krb5-config $dev/bin/ # asn1 compilers, move them to $dev
mv $out/libexec/heimdal/heimdal/* $dev/bin
# Move remaining binaries to $bin rmdir $out/libexec/heimdal/heimdal
mv $out/bin/* $bin/bin/
''; '';
# Issues with hydra # Issues with hydra