Fix the RPM build

This commit is contained in:
Eelco Dolstra 2014-02-07 17:34:39 +01:00
parent 7fab23e237
commit 0432bc52ea
1 changed files with 4 additions and 12 deletions

View File

@ -117,19 +117,14 @@ make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' 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 # Specify build users group
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nix
echo "build-users-group = %{nixbld_group}" > $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf echo "build-users-group = %{nixbld_group}" > $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf
# make per-user directories # make per-user directories
for d in profiles gcroots; for d in profiles gcroots;
do 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 chmod 1777 $RPM_BUILD_ROOT/nix/var/nix/$d/per-user
done done
@ -149,7 +144,7 @@ cp -p misc/systemd/nix-daemon.service \
cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/
# we ship this file in the base package # 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 %clean
@ -176,10 +171,8 @@ systemctl start nix-daemon.service
%endif %endif
%files %files
%doc COPYING AUTHORS README
%{_bindir}/nix-* %{_bindir}/nix-*
%dir %{_libdir}/nix %{_libdir}/*.so
%{_libdir}/nix/*.so.*
%{perl_vendorarch}/* %{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/ %exclude %dir %{perl_vendorarch}/auto/
%{_prefix}/libexec/* %{_prefix}/libexec/*
@ -198,7 +191,6 @@ systemctl start nix-daemon.service
%files devel %files devel
%{_includedir}/nix %{_includedir}/nix
%{_libdir}/nix/*.so
%files doc %files doc
%docdir %{_defaultdocdir}/%{name}-doc-%{version} %docdir %{_defaultdocdir}/%{name}-doc-%{version}