diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-12-01 00:43:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-01 00:43:02 +0000 |
| commit | 84162175a3ff1b9649b65b5201c063a51cd40368 (patch) | |
| tree | 42ebad1a88d0b1bfe8fab54f815841a1e12ea342 /pkgs/misc | |
| parent | 3a3513e7e7d4c252d6240a62d377ef723509d8c0 (diff) | |
| parent | 694b4d29e1d0e4c86d497da437a3eed90910a7db (diff) | |
| download | nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.tar nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.tar.gz nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.tar.bz2 nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.tar.lz nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.tar.xz nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.tar.zst nixlib-84162175a3ff1b9649b65b5201c063a51cd40368.zip | |
Merge pull request #51180 from mayflower/xorg-cross
treewide: cross-fixes
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 38ad73d01600..227886e126fc 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -60,7 +60,9 @@ stdenv.mkDerivation rec { ++ optional (libpaper != null) "--enable-libpaper" ++ optional stdenv.isDarwin "--disable-launchd"; + # AR has to be an absolute path preConfigure = '' + export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" configureFlagsArray+=( # Put just lib/* and locale into $lib; this didn't work directly. # lib/cups is moved back to $out in postInstall. |