pyrox.dev
lol
tk: fix missing definition in macOS header
+38
-3
+19
-1
pkgs/development/libraries/tk/8.5.nix
+19
-1
pkgs/development/libraries/tk/8.5.nix
···
1
-
{ callPackage, fetchurl, tcl, ... } @ args:
1
+
{ lib
2
+
, stdenv
3
+
, callPackage
4
+
, fetchurl
5
+
, fetchpatch
6
+
, tcl
7
+
, ...
8
+
} @ args:
2
9
3
10
callPackage ./generic.nix (args // {
4
11
···
6
13
url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
7
14
sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";
8
15
};
16
+
17
+
patches = lib.optionals stdenv.isDarwin [
18
+
# Define MODULE_SCOPE before including tkPort.h
19
+
# https://core.tcl-lang.org/tk/info/dba9f5ce3b
20
+
(fetchpatch {
21
+
name = "module_scope.patch";
22
+
url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a";
23
+
extraPrefix = "";
24
+
sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv";
25
+
})
26
+
];
9
27
10
28
})
+19
-2
pkgs/development/libraries/tk/8.6.nix
+19
-2
pkgs/development/libraries/tk/8.6.nix
···
1
-
{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args:
1
+
{ lib
2
+
, stdenv
3
+
, callPackage
4
+
, fetchurl
5
+
, fetchpatch
6
+
, tcl
7
+
, ...
8
+
} @ args:
2
9
3
10
callPackage ./generic.nix (args // {
4
11
···
7
14
sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00";
8
15
};
9
16
10
-
patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
17
+
patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [
18
+
./Fix-bad-install_name-for-libtk8.6.dylib.patch
19
+
# Define MODULE_SCOPE before including tkPort.h
20
+
# https://core.tcl-lang.org/tk/info/dba9f5ce3b
21
+
(fetchpatch {
22
+
name = "module_scope.patch";
23
+
url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a";
24
+
extraPrefix = "";
25
+
sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv";
26
+
})
27
+
];
11
28
12
29
})