From 40250f23a0a301bb758e7f0f21fcd09b702e0e1e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 May 2014 19:04:10 +0200 Subject: [PATCH] Don't install Upstart job on Fedora Also, don't install a nix.conf anymore, it's not needed. http://hydra.nixos.org/build/10775854 --- nix.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nix.spec.in b/nix.spec.in index 4ec8cfe65..6c7eaaddd 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -117,10 +117,6 @@ make DESTDIR=$RPM_BUILD_ROOT install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -# 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 @@ -138,6 +134,9 @@ cp -p misc/emacs/nix-mode.elc $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ # we ship this file in the base package rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-doc-%{version}/README +# Get rid of Upstart job. +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init + %clean rm -rf $RPM_BUILD_ROOT