JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tk: fix missing definition in macOS header

Browse Source
This commit is contained in:
Ryan Burns 2021-09-23 00:45:23 -07:00
parent 611b805c53
commit a86e1f5dac
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/tk/8.5.nix
View File

@ -1,4 +1,11 @@
{ callPackage, fetchurl, tcl, ... } @ args: { lib
, stdenv
, callPackage
, fetchurl
, fetchpatch
, tcl
, ...
} @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
@ -7,4 +14,15 @@ callPackage ./generic.nix (args // {
sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03"; sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";
}; };
patches = lib.optionals stdenv.isDarwin [
# Define MODULE_SCOPE before including tkPort.h
# https://core.tcl-lang.org/tk/info/dba9f5ce3b
(fetchpatch {
name = "module_scope.patch";
url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a";
extraPrefix = "";
sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv";
})
];
}) })

21
pkgs/development/libraries/tk/8.6.nix
View File

@ -1,4 +1,11 @@
{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args: { lib
, stdenv
, callPackage
, fetchurl
, fetchpatch
, tcl
, ...
} @ args:
callPackage ./generic.nix (args // { callPackage ./generic.nix (args // {
@ -7,6 +14,16 @@ callPackage ./generic.nix (args // {
sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00";
}; };
patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [
./Fix-bad-install_name-for-libtk8.6.dylib.patch
# Define MODULE_SCOPE before including tkPort.h
# https://core.tcl-lang.org/tk/info/dba9f5ce3b
(fetchpatch {
name = "module_scope.patch";
url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a";
extraPrefix = "";
sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv";
})
];
}) })