[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
205/376: Update spec file
From: |
Ludovic Courtès |
Subject: |
205/376: Update spec file |
Date: |
Wed, 28 Jan 2015 22:05:04 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit d4a71ec3bfefa2f07e076895217414a9a842d6dc
Author: Eelco Dolstra <address@hidden>
Date: Thu Sep 18 15:42:01 2014 +0200
Update spec file
http://hydra.nixos.org/build/14344391
---
nix.spec.in | 1 +
src/libexpr/local.mk | 2 +-
src/libmain/local.mk | 2 +-
src/libstore/local.mk | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/nix.spec.in b/nix.spec.in
index 7d7775b..4dbfdfa 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -181,6 +181,7 @@ systemctl start nix-daemon.socket
%files devel
%{_includedir}/nix
+%{_prefix}/lib/pkgconfig/*.pc
%files doc
%docdir %{_defaultdocdir}/%{name}-doc-%{version}
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index 6bb1511..4c1f4de 100644
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -27,4 +27,4 @@ clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh
$(d)/lexer-tab.cc $(d)/lexe
dist-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc
$(d)/lexer-tab.hh
-$(eval $(call install-file-in, $(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644))
+$(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig,
0644))
diff --git a/src/libmain/local.mk b/src/libmain/local.mk
index 4b6a476..16dbf75 100644
--- a/src/libmain/local.mk
+++ b/src/libmain/local.mk
@@ -10,4 +10,4 @@ libmain_LIBS = libstore libutil libformat
libmain_ALLOW_UNDEFINED = 1
-$(eval $(call install-file-in, $(d)/nix-main.pc, $(libdir)/pkgconfig, 0644))
+$(eval $(call install-file-in, $(d)/nix-main.pc, $(prefix)/lib/pkgconfig,
0644))
diff --git a/src/libstore/local.mk b/src/libstore/local.mk
index 024d7de..7c99fd7 100644
--- a/src/libstore/local.mk
+++ b/src/libstore/local.mk
@@ -31,4 +31,4 @@ $(d)/local-store.cc: $(d)/schema.sql.hh
clean-files += $(d)/schema.sql.hh
-$(eval $(call install-file-in, $(d)/nix-store.pc, $(libdir)/pkgconfig, 0644))
+$(eval $(call install-file-in, $(d)/nix-store.pc, $(prefix)/lib/pkgconfig,
0644))
- 196/376: Delete bugs.xml, (continued)
- 196/376: Delete bugs.xml, Ludovic Courtès, 2015/01/28
- 183/376: Manual build fixes, Ludovic Courtès, 2015/01/28
- 203/376: Remove unused w3m dependency, Ludovic Courtès, 2015/01/28
- 182/376: Merge branch 'master' of github.com:thatdocslady/nix, Ludovic Courtès, 2015/01/28
- 207/376: Remove debug statement, Ludovic Courtès, 2015/01/28
- 204/376: Install some pkgconfig files, Ludovic Courtès, 2015/01/28
- 206/376: Store.so: Add dependency on libnixutil, Ludovic Courtès, 2015/01/28
- 200/376: Add some instrumentation for debugging GC leaks, Ludovic Courtès, 2015/01/28
- 210/376: Inline Bindings::find(), Ludovic Courtès, 2015/01/28
- 202/376: On Linux, disable address space randomization, Ludovic Courtès, 2015/01/28
- 205/376: Update spec file,
Ludovic Courtès <=
- 201/376: Add Make flag to disable optimization, Ludovic Courtès, 2015/01/28
- 213/376: configure: Force regeneration of Makefile.config, Ludovic Courtès, 2015/01/28
- 212/376: attrNames: Don't allocate duplicates of the symbols, Ludovic Courtès, 2015/01/28
- 216/376: Handle cycles when printing a value, Ludovic Courtès, 2015/01/28
- 211/376: Fix off-by-one, Ludovic Courtès, 2015/01/28
- 215/376: Add ‘seq’ primop, Ludovic Courtès, 2015/01/28
- 209/376: Store Attrs inside Bindings, Ludovic Courtès, 2015/01/28
- 208/376: Remove bogus comment, Ludovic Courtès, 2015/01/28
- 219/376: Add ‘deepSeq’ primop, Ludovic Courtès, 2015/01/28
- 225/376: Pass through --set from nix-install-package command line to nix-env, Ludovic Courtès, 2015/01/28