diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2012-09-24 23:49:11 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2012-09-24 23:49:11 +0400 |
| commit | 4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8 (patch) | |
| tree | 93e15abb8eb8a01566118a48843dbdd3214e3746 /pkgs/development/libraries/libre/default.nix | |
| parent | 732811700a849e53b4411ec9395b12c3ce5277db (diff) | |
| download | nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.tar nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.tar.gz nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.tar.bz2 nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.tar.lz nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.tar.xz nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.tar.zst nixpkgs-4517d03af1babd6c42cfbf2b27f0c9a4a6b222f8.zip | |
Opportunistic measures to prevent the need to convert null to string; they may work or may not work for actually building
Diffstat (limited to 'pkgs/development/libraries/libre/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libre/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 208744fcdde..cc9139d664e 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { buildInputs = [zlib openssl]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" - "SYSROOT=${stdenv.gcc.libc}" - "SYSROOT_ALT=${stdenv.gcc.gcc}" ''PREFIX=$(out)'' - ]; + ] + ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" + ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ; meta = { homepage = "http://www.creytiv.com/re.html"; platforms = with stdenv.lib.platforms; linux; |