diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/applications/graphics/inkscape/configure-python-libs.patch | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/applications/graphics/inkscape/configure-python-libs.patch')
| -rw-r--r-- | pkgs/applications/graphics/inkscape/configure-python-libs.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/inkscape/configure-python-libs.patch b/pkgs/applications/graphics/inkscape/configure-python-libs.patch deleted file mode 100644 index c79006d3320..00000000000 --- a/pkgs/applications/graphics/inkscape/configure-python-libs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Work around Python misdetection and set `PYTHON_LIBS' to -"-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so". -Changed to 2.5. - ---- inkscape-0.45.1/configure 2007-03-20 14:56:43.000000000 +0100 -+++ inkscape-0.45.1/configure 2008-02-22 16:19:10.000000000 +0100 -@@ -10202,7 +10202,7 @@ if test "x$with_python" = "xyes"; then - if test "$?" -gt "0"; then - with_python="no" - else -- checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` -+ checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '-L%s -lpython2.5 %s' % (distutils.sysconfig.get_config_var('LIBDIR'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` - if test "$?" -gt "0"; then - with_python="no" - else |