diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 09:29:01 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-01-24 10:03:33 +0200 |
| commit | 96372f2edb4b00a71a0aa9a97679853ffb95e3c6 (patch) | |
| tree | 7a1b0542a3e62606986fd08c6b01d91eab52847b | |
| parent | 51bf60b33e0c85e1d3beb5d7a12efe702efae864 (diff) | |
| download | nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.tar nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.tar.gz nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.tar.bz2 nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.tar.lz nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.tar.xz nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.tar.zst nixlib-96372f2edb4b00a71a0aa9a97679853ffb95e3c6.zip | |
treewide: Mass replace 'cairo}/lib' to refer the 'out' output
| -rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 976fd253a7cd..e59be1ea6c31 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -490,7 +490,7 @@ in { "${cfg.api.package}/lib/python2.7/site-packages:" + concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; GRAPHITE_API_CONFIG = graphiteApiConfig; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; }; serviceConfig = { ExecStart = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48db91f15575..e0b4223f6f43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2565,7 +2565,7 @@ in modules // { patchPhase = '' # 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 = { |