From f410ec16c4c57aad7f4bbc4c01abe146c49217b0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 23 Aug 2016 04:33:36 +0300
Subject: [PATCH] treewide: Fix output references to cups
---
pkgs/misc/cups/drivers/samsung/default.nix | 2 +-
pkgs/misc/cups/filters.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index 26ab793f3155..5f870bf92174 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
my_patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
- --set-rpath ${cups}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
+ --set-rpath ${cups.out}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
- ${arch}/{pstosecps,rastertospl,smfpnetdiscovery}
mkdir -p $out/etc/sane.d/dll.d/
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index f1f597ac0a04..e4c70e2fe988 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
# Ensure that bannertopdf can find the PDF templates in
# $out. (By default, it assumes that cups and cups-filters are
# installed in the same prefix.)
- substituteInPlace config.h --replace ${cups}/share/cups/data $out/share/cups/data
+ substituteInPlace config.h --replace ${cups.out}/share/cups/data $out/share/cups/data
# Ensure that gstoraster can find gs in $PATH.
substituteInPlace filter/gstoraster.c --replace execve execvpe