Author: urkud
Date: Sat Jan 28 12:44:42 2012
New Revision: 31906
URL: https://nixos.org/websvn/nix/?rev=31906&sc=1
Log:
Introduce libiconvOrNull and libiconvOrGlibc
One can use these attrs instead of custom 'if ... then libiconv else null'.
This way we can maintain the correct 'if ... then' check in one place.
NB: I don't know what is the correct condition, so I use stdenv.isLinux. Feel
free to fix this.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 28 12:29:35
2012 (r31905)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Jan 28 12:44:42
2012 (r31906)
@@ -4054,6 +4054,10 @@
libiconv = callPackage ../development/libraries/libiconv { };
+ libiconvOrNull = if gcc ? libc then null else libiconv;
+
+ libiconvOrLibc = if gcc ? libc then gcc.libc else libiconv;
+
libid3tag = callPackage ../development/libraries/libid3tag { };
libidn = callPackage ../development/libraries/libidn { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
