forked from mirrors/nixpkgs
* Make xlibs build again.
svn path=/nixpkgs/trunk/; revision=1449
This commit is contained in:
parent
698967c01d
commit
be49175db4
|
@ -59,3 +59,8 @@ stdenv.mkDerivation {
|
|||
that the gcc passes a `-lgcc_s' switch to the linker. Solution:
|
||||
patch the linker so that rpaths are only added for libraries that we
|
||||
actually use.
|
||||
|
||||
|
||||
* Perl has retained dependencies on gcc, binutils, coreutils, sed.
|
||||
|
||||
|
||||
|
|
|
@ -10,9 +10,3 @@
|
|||
|
||||
* After building gcc, filter out references to /tmp/nix... in
|
||||
.../lib/libsupc++.la and .../lib/libstdc++.la
|
||||
|
||||
|
||||
|
||||
* change dontMake & dontMakeInstall into dontBuild and dontInstall in
|
||||
./development/libraries/xlibs/xlibs/builder.sh (or put it in its
|
||||
default.nix)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{stdenv, fetchurl, pkgconfig, freetype, expat, patch}:
|
||||
{stdenv, fetchurl, pkgconfig, freetype, expat}:
|
||||
|
||||
rec {
|
||||
|
||||
|
@ -55,7 +55,7 @@ rec {
|
|||
};
|
||||
|
||||
libXmu = (import ./libXmu) {
|
||||
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext patch;
|
||||
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext;
|
||||
};
|
||||
|
||||
libXpm = (import ./libXpm) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
. $stdenv/setup
|
||||
dontMake=1
|
||||
dontBuild=1
|
||||
dontMakeInstall=1
|
||||
nop() {
|
||||
sourceRoot=.
|
||||
|
|
Loading…
Reference in a new issue