3
0
Fork 0
forked from mirrors/nixpkgs

add a patch which removes a dependency on /bin/pwd so it can be built on

NixOS. It also prevents the following warning:

./configure: line 19: /bin/pwd: No such file or directory
./configure: line 21: /bin/pwd: No such file or directory
The LICENSE, LICENSE.QPL, or LICENSE.GPL file shipped with
this software has disappeared.

Sorry, you are not licensed to use this software.
Try re-installing.

:D

svn path=/nixpkgs/trunk/; revision=4272
This commit is contained in:
Armijn Hemel 2005-11-12 19:07:37 +00:00
parent cedeeb31e8
commit dae499bd6d
2 changed files with 16 additions and 1 deletions

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation {
buildInputs = [x11 libXft libXrender zlib libjpeg libpng which];
# Don't strip everything so we can get useful backtraces.
patches = [./strip.patch];
patches = [./strip.patch ./qt-pwd.patch];
inherit threadSupport xftSupport libXft xrenderSupport libXrender;
inherit mysqlSupport;

View file

@ -0,0 +1,15 @@
diff -ruN qt-x11-free-3.3.3/configure qt-x11-free-3.3.3.new/configure
--- qt-x11-free-3.3.3/configure 2004-06-14 11:18:55.000000000 +0200
+++ qt-x11-free-3.3.3.new/configure 2005-11-12 19:39:43.000000000 +0100
@@ -16,9 +16,9 @@
relconf=`basename $0`
# the directory of this script is the "source tree"
relpath=`dirname $0`
-relpath=`(cd $relpath; /bin/pwd)`
+relpath=`(cd $relpath; pwd)`
# the current directory is the "build tree" or "object tree"
-outpath=`/bin/pwd`
+outpath=`pwd`
# later cache the command line in config.status
OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,-v$,,g"`