diff options
| author | Josef Knedl <josef.kemetmueller@aon.at> | 2016-02-24 01:01:46 +0100 |
|---|---|---|
| committer | Josef Knedl <josef.kemetmueller@aon.at> | 2016-02-25 17:57:22 +0100 |
| commit | 5e1da18b6dc3305912ccd1a54c7b0337d1cafc17 (patch) | |
| tree | b7d8cd5059ebc84e4b22e3e15b17c9cf7875b865 /pkgs/development/libraries/tk | |
| parent | 2ce19d0ba44a17c00e0c7105a5caeaaaf73f1675 (diff) | |
| download | nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.tar nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.tar.gz nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.tar.bz2 nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.tar.lz nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.tar.xz nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.tar.zst nixpkgs-5e1da18b6dc3305912ccd1a54c7b0337d1cafc17.zip | |
tk: Fixes NixOS/nixpkgs#13377 (bad install_name)
Patch is based on: https://trac.macports.org/changeset/100816 of bug report: https://trac.macports.org/ticket/37395
Diffstat (limited to 'pkgs/development/libraries/tk')
| -rw-r--r-- | pkgs/development/libraries/tk/8.6.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index 110151227bd..c10771c9109 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, tcl, ... } @ args: +{ callPackage, fetchurl, tcl, stdenv, ... } @ args: callPackage ./generic.nix (args // rec { @@ -7,7 +7,7 @@ callPackage ./generic.nix (args // rec { sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88"; }; - patches = [ ./different-prefix-with-tcl.patch ]; + patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; }) diff --git a/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch b/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch new file mode 100644 index 00000000000..528a75e1c91 --- /dev/null +++ b/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch @@ -0,0 +1,29 @@ +From f90278dac42135acd55200b7d2153f44d72fec53 Mon Sep 17 00:00:00 2001 +From: Josef Knedl <josef.kemetmueller@aon.at> +Date: Wed, 24 Feb 2016 00:37:40 +0100 +Subject: [PATCH] Fix bad install_name for libtk8.6.dylib + +This follows: https://trac.macports.org/ticket/37395 +and https://trac.macports.org/changeset/100816 +Alternative would be to use Quartz build instead: +https://sourceforge.net/p/tktoolkit/bugs/3048/ +--- + unix/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unix/Makefile.in b/unix/Makefile.in +index f21fdbb..1b89256 100644 +--- a/unix/Makefile.in ++++ b/unix/Makefile.in +@@ -283,7 +283,7 @@ CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@ + LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ + + # support for embedded libraries on Darwin / Mac OS X +-DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} ++DYLIB_INSTALL_DIR = $(libdir) + + # support for building the Aqua resource file + TK_RSRC_FILE = @TK_RSRC_FILE@ +-- +2.7.1 + |