diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
| commit | 7689a348c4eb7ed55bfaa273fadbb036f7f0bde7 (patch) | |
| tree | 8ebc0483e7a9f60f47c00f1cc09675cfcf2bc2f1 /pkgs/servers | |
| parent | 0f10222e4ecee30837fe7631a37e343ccf82f49f (diff) | |
| download | nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.gz nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.bz2 nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.lz nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.xz nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.tar.zst nixlib-7689a348c4eb7ed55bfaa273fadbb036f7f0bde7.zip | |
* Got rid of a lot of "postInstall=postInstall" and similar lines in
builders. These are redundant now. * Inlined some trivial builders. * Removed a few explicit setup-hook creations. This is done automatically now if setupHook is set. * Deleted the initscripts package. NixOS doesn't use it anymore. svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/x11/xorg/imake.sh | 1 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/xorgserver.sh | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/imake.sh b/pkgs/servers/x11/xorg/imake.sh index 2de4412e063b..131ce0e832ca 100644 --- a/pkgs/servers/x11/xorg/imake.sh +++ b/pkgs/servers/x11/xorg/imake.sh @@ -1,4 +1,3 @@ -preInstall=preInstall preInstall() { ensureDir $out/lib/X11/config ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config diff --git a/pkgs/servers/x11/xorg/xorgserver.sh b/pkgs/servers/x11/xorg/xorgserver.sh index d0ee29dabcf6..0beb09d61a7f 100644 --- a/pkgs/servers/x11/xorg/xorgserver.sh +++ b/pkgs/servers/x11/xorg/xorgserver.sh @@ -3,7 +3,6 @@ # NixOS, so force Make to search in our own Glibc. export VPATH=$(cat ${NIX_GCC}/nix-support/orig-libc)/lib -preConfigure=preConfigure preConfigure() { unpackFile $mesaSrc configureFlags="$configureFlags --with-mesa-source=$(ls -d $(pwd)/Mesa-*)" |