File tree Expand file tree Collapse file tree 3 files changed +25
-0
lines changed
pkgs/development/compilers/rust Expand file tree Collapse file tree 3 files changed +25
-0
lines changed Original file line number Diff line number Diff line change 6
6
# request review, in case platforms cannot be covered.
7
7
# 2. The LLVM version used for building should match with rust upstream.
8
8
# 3. Firefox and Thunderbird should still build on x86_64-linux.
9
+
10
+ { stdenv , lib
11
+ , buildPackages
12
+ , newScope , callPackage
13
+ , CoreFoundation , Security
14
+ , llvmPackages_5
15
+ , pkgsBuildTarget , pkgsBuildBuild
16
+ , fetchpatch
17
+ } @ args :
18
+
9
19
import ./default.nix {
10
20
rustcVersion = "1.41.0" ;
11
21
rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm" ;
@@ -26,4 +36,13 @@ import ./default.nix {
26
36
} ;
27
37
28
38
selectRustPackage = pkgs : pkgs . rust_1_41_0 ;
39
+
40
+ rustcPatches = [
41
+ ( fetchpatch {
42
+ url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff" ;
43
+ sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk" ;
44
+ } )
45
+ ] ;
29
46
}
47
+
48
+ ( builtins . removeAttrs args [ "fetchpatch" ] )
Original file line number Diff line number Diff line change 4
4
, bootstrapVersion
5
5
, bootstrapHashes
6
6
, selectRustPackage
7
+ , rustcPatches ? [ ]
7
8
} :
8
9
{ stdenv , lib
9
10
, buildPackages
73
74
sha256 = rustcSha256 ;
74
75
inherit enableRustcDev ;
75
76
77
+ patches = rustcPatches ;
78
+
76
79
# Use boot package set to break cycle
77
80
rustPlatform = bootRustPlatform ;
78
81
} // lib . optionalAttrs ( stdenv . cc . isClang && stdenv . hostPlatform == stdenv . buildPlatform ) {
Original file line number Diff line number Diff line change 7
7
, enableRustcDev ? true
8
8
, version
9
9
, sha256
10
+ , patches ? [ ]
10
11
} :
11
12
12
13
let
@@ -104,6 +105,8 @@ in stdenv.mkDerivation rec {
104
105
# the rust build system complains that nix alters the checksums
105
106
dontFixLibtool = true ;
106
107
108
+ inherit patches ;
109
+
107
110
postPatch = ''
108
111
patchShebangs src/etc
109
112
You can’t perform that action at this time.
0 commit comments