From 087dee6e1b673b1e49f7c49fa0f05eb651bb5e94 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 11:56:55 -0400 Subject: Get rid of nix.conf.example No need to duplicate the nix.conf manpage. --- nix.spec.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nix.spec.in') diff --git a/nix.spec.in b/nix.spec.in index 44ea8d7c9476..29e53c0c350e 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -121,10 +121,7 @@ ln -sf %{_libdir}/nix/libNixStore.so.0 Store.so popd # Specify build users group -sed -i "s|#build-users-group =$|build-users-group = %{nixbld_group}|" \ - $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf -# ... and delete the example configuration -rm $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf.example +echo "build-users-group = %{nixbld_group}" > $RPM_BUILD_ROOT%{_sysconfdir}/nix/nix.conf # make per-user directories for d in profiles gcroots; -- cgit 1.4.1 From a560124cdf43a08733d85336f7c8172fea1cfc5a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 11:58:12 -0400 Subject: Fix RPM builds http://hydra.nixos.org/build/2784908 --- nix.spec.in | 1 + 1 file changed, 1 insertion(+) (limited to 'nix.spec.in') diff --git a/nix.spec.in b/nix.spec.in index 29e53c0c350e..9413ef7b397c 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -190,6 +190,7 @@ systemctl start nix-worker.service %{_datadir}/emacs/site-lisp/nix-mode.el %{_datadir}/nix %{_mandir}/man1/nix-*.1* +%{_mandir}/man5/nix-*.5* %{_mandir}/man8/nix-*.8* %config(noreplace) %{_sysconfdir}/profile.d/nix.sh /nix -- cgit 1.4.1 From 27f0c34390d6680a843e2d4fad527dc672ed35c6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 9 Jul 2012 13:16:09 -0400 Subject: Really fix RPM builds --- nix.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nix.spec.in') diff --git a/nix.spec.in b/nix.spec.in index 9413ef7b397c..8b1ea8a543e9 100644 --- a/nix.spec.in +++ b/nix.spec.in @@ -189,9 +189,9 @@ systemctl start nix-worker.service %endif %{_datadir}/emacs/site-lisp/nix-mode.el %{_datadir}/nix -%{_mandir}/man1/nix-*.1* -%{_mandir}/man5/nix-*.5* -%{_mandir}/man8/nix-*.8* +%{_mandir}/man1/*.1* +%{_mandir}/man5/*.5* +%{_mandir}/man8/*.8* %config(noreplace) %{_sysconfdir}/profile.d/nix.sh /nix %dir %{_sysconfdir}/nix -- cgit 1.4.1