JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Revert the manual changes to default.nix

Browse Source 
* Build libSM with the system libuuid on Darwin (in such a way that we
  don't get a rebuild on all other platforms).

svn path=/nixpkgs/trunk/; revision=17606
This commit is contained in:
Eelco Dolstra 2009-10-02 13:06:35 +00:00
parent 6e6473940d
commit 317fd0edd5
2 changed files with 238 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

469
pkgs/servers/x11/xorg/default.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -75,5 +75,9 @@
ln -s /var/tmp $out/share/X11/xkb/compiled
'';
};
libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
};
}