Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* FreeBSD-specific hacks.

svn path=/nixpkgs/branches/freebsd-losser/; revision=266
  • Loading branch information...
commit 80fbb24c9f71ba25e75d0f73a94be24d011fb208 1 parent 391c269
@edolstra edolstra authored
View
2  pkgs/stdenv-linux/gcc-wrapper.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/local/bin/bash
IFS=
View
3  pkgs/subversion/subversion-build.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-export NIX_LDFLAGS=-Wl,-s
+export NIX_LDFLAGS="-Wl,-s -pthread"
. $stdenv/setup || exit 1
@@ -21,6 +21,7 @@ if test $httpServer; then
fi
if test $pythonBindings; then
+ export PYTHON=$python/bin/python
extraflags="--with-swig=$swig $extraflags"
fi
View
1  pkgs/subversion/subversion.fix
@@ -20,6 +20,7 @@ Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
, ("ssl", If(Var("httpsClient"), IncludeFix("openssl/openssl.fix"), ""))
, ("swig", If(Var("pythonBindings"), IncludeFix("swig/swig.fix"), ""))
+ , ("python", "/usr/local")
, ("httpd", If(Var("httpServer"), IncludeFix("httpd/httpd.fix"), ""))
, ("db4", If(Var("localServer"), IncludeFix("db4/db4.fix"), ""))
, ("libxml", IncludeFix("libxml2/libxml2.fix"))
View
6 pkgs/swig/swig-build.sh
@@ -6,6 +6,6 @@ export NIX_LDFLAGS=-Wl,-s
tar xvfz $src || exit 1
cd SWIG-* || exit 1
-./configure --prefix=$out || exit 1
-gmake || exit 1
-gmake install || exit 1
+./configure --prefix=$out --with-python=$python/bin/python || exit 1
+/usr/local/bin/gmake || exit 1
+/usr/local/bin/gmake install || exit 1
View
2  pkgs/swig/swig.fix
@@ -8,5 +8,7 @@ Package(
]))
, ("stdenv", IncludeFix("stdenv/stdenv.fix"))
+
+ , ("python", "/usr/local")
]
)
Please sign in to comment.
Something went wrong with that request. Please try again.