Permalink
Browse files

Fix the RPM build

  • Loading branch information...
1 parent 7fab23e commit 0432bc52ea21bb7b60477965054362f7414c569f @edolstra edolstra committed Feb 7, 2014
Showing with 4 additions and 12 deletions.
  1. +4 −12 nix.spec.in
View
@@ -117,19 +117,14 @@ make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-# Fix symlink: we want to link to the versioned soname, not to the
-# unversioned one that'd be put in -devel
-pushd $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Nix/Store
-ln -sf %{_libdir}/nix/libNixStore.so.0 Store.so
-popd
-
# Specify build users group
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nix
echo "build-users-group = %{nixbld_group}" > $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf
# make per-user directories
for d in profiles gcroots;
do
- mkdir $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
+ mkdir -p $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
chmod 1777 $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
done
@@ -149,7 +144,7 @@ cp -p misc/systemd/nix-daemon.service \
cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/
# we ship this file in the base package
-rm $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README
+rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README
%clean
@@ -176,10 +171,8 @@ systemctl start nix-daemon.service
%endif
%files
-%doc COPYING AUTHORS README
%{_bindir}/nix-*
-%dir %{_libdir}/nix
-%{_libdir}/nix/*.so.*
+%{_libdir}/*.so
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_prefix}/libexec/*
@@ -198,7 +191,6 @@ systemctl start nix-daemon.service
%files devel
%{_includedir}/nix
-%{_libdir}/nix/*.so
%files doc
%docdir %{_defaultdocdir}/%{name}-doc-%{version}

0 comments on commit 0432bc5

Please sign in to comment.