From ceabe138cb72b28526a0329bcc81a4af9d3d65b9 Mon Sep 17 00:00:00 2001 From: Pragmatic Cypher Date: Fri, 11 May 2018 14:36:57 +0100 Subject: system/nix: Updated for version 2.0.2. Signed-off-by: David Spencer --- system/nix/nix.SlackBuild | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'system/nix/nix.SlackBuild') diff --git a/system/nix/nix.SlackBuild b/system/nix/nix.SlackBuild index 8925bc1230618..825db7c78a7c7 100644 --- a/system/nix/nix.SlackBuild +++ b/system/nix/nix.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nix -VERSION=${VERSION:-1.11.13} +VERSION=${VERSION:-2.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,9 +72,10 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --mandir=/usr/man \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --sysconfdir=/etc \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux @@ -82,7 +83,10 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -install -D --mode 0755 $CWD/rc.nix $PKG/etc/rc.d/rc.nix.new +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +install -D --mode 0755 $CWD/config/rc.nix $PKG/etc/rc.d/rc.nix.new mkdir -p $PKG/nix mkdir -p $PKG/var/nix/profiles mkdir -p $PKG/nix/var/nix/profiles @@ -91,13 +95,7 @@ mkdir -p $PKG/nix/var/nix/daemon-socket rm -fr $PKG/etc/init.d rm -fr $PKG/usr/lib/systemd -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl -mv $PKG/usr/lib${LIBDIRSUFFIX}/perl5/site_perl/**/**/* $PKG/usr/lib${LIBDIRSUFFIX}/perl5/vendor_perl -rm -r $PKG/usr/lib${LIBDIRSUFFIX}/perl5/site_perl - -if [ "$ARCH" = "x86_64" ]; then - mv $PKG/usr/lib/pkgconfig/ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/ -fi +mv $PKG/usr/lib/pkgconfig/ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done @@ -106,6 +104,10 @@ if [ "$ARCH" = "x86_64" ]; then rm -rf $PKG/usr/lib fi +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -- cgit v1.2.3