alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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

1
pkgs/servers/x11/xorg/default.nix
View file

@ -614,7 +614,6 @@ let
url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2; url = mirror://xorg/X11R7.4/src/everything/libSM-1.1.0.tar.bz2;
sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm"; sha256 = "10iap6ydxmk0g5qcfnsf9yc30fhvqshgppm0sca21y0z5qwaqdkm";
}; };
configureFlags = if stdenv.system == "i686-darwin" then "LIBUUID_CFLAGS='' LIBUUID_LIBS=''" else "";
buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
})) // {inherit libICE libuuid xproto xtrans ;}; })) // {inherit libICE libuuid xproto xtrans ;};

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

@ -76,4 +76,8 @@
''; '';
}; };
libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
configureFlags = "LIBUUID_CFLAGS='' LIBUUID_LIBS=''";
};
} }