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

* Make xlibs build again.

Browse Source 
svn path=/nixpkgs/trunk/; revision=1449
This commit is contained in:
Eelco Dolstra 2004-09-18 21:11:16 +00:00
parent 698967c01d
commit be49175db4
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/BUGS
View File

@ -59,3 +59,8 @@ stdenv.mkDerivation {
that the gcc passes a `-lgcc_s' switch to the linker. Solution: 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 patch the linker so that rpaths are only added for libraries that we
actually use. actually use.
* Perl has retained dependencies on gcc, binutils, coreutils, sed.

6
pkgs/TODO
View File

@ -10,9 +10,3 @@
* After building gcc, filter out references to /tmp/nix... in * After building gcc, filter out references to /tmp/nix... in
.../lib/libsupc++.la and .../lib/libstdc++.la .../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)

4
pkgs/development/libraries/xlibs/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, freetype, expat, patch}: {stdenv, fetchurl, pkgconfig, freetype, expat}:
rec { rec {
@ -55,7 +55,7 @@ rec {
}; };
libXmu = (import ./libXmu) { libXmu = (import ./libXmu) {
inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext patch; inherit fetchurl stdenv pkgconfig xproto libX11 libXt libXext;
}; };
libXpm = (import ./libXpm) { libXpm = (import ./libXpm) {

2
pkgs/development/libraries/xlibs/xlibs/builder.sh
View File

@ -1,5 +1,5 @@
. $stdenv/setup . $stdenv/setup
dontMake=1 dontBuild=1
dontMakeInstall=1 dontMakeInstall=1
nop() { nop() {
sourceRoot=. sourceRoot=.