nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: Mass replace 'cairo}/lib' to refer the 'out' output

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:29:01 +02:00
parent 51bf60b33e
commit 96372f2edb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/monitoring/graphite.nix
View File

@ -490,7 +490,7 @@ in {
"${cfg.api.package}/lib/python2.7/site-packages:" + "${cfg.api.package}/lib/python2.7/site-packages:" +
concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders;
GRAPHITE_API_CONFIG = graphiteApiConfig; GRAPHITE_API_CONFIG = graphiteApiConfig;
LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
}; };
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''

2
pkgs/top-level/python-packages.nix
View File

@ -2565,7 +2565,7 @@ in modules // {
patchPhase = '' patchPhase = ''
# Hardcode cairo library path # Hardcode cairo library path
sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py
''; '';
meta = { meta = {