pyrox.dev
nixUnstable: fix build on gcc10
authored by
Lucas Ransan
and committed by
Frederik Rietdijk
2cb2a534
a909a45e
+10
-3
pkgs/tools/package-management/nix/default.nix
+10
-3
pkgs/tools/package-management/nix/default.nix
···
1
-
{ lib, fetchurl, fetchFromGitHub, callPackage
2
, storeDir ? "/nix/store"
3
, stateDir ? "/nix/var"
4
, confDir ? "/etc"
···
23
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
24
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
25
, enableStatic ? false
26
-
, name, suffix ? "", src
27
28
}:
29
let
30
sh = busybox-sandbox-shell;
31
nix = stdenv.mkDerivation rec {
32
-
inherit name src;
33
version = lib.getVersion name;
34
35
is24 = lib.versionAtLeast version "2.4pre";
···
207
rev = "5a6ddb3de14a1684af6c793d663764d093fa7846";
208
sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g";
209
};
210
211
inherit storeDir stateDir confDir boehmgc;
212
});
···
1
+
{ lib, fetchurl, fetchpatch, fetchFromGitHub, callPackage
2
, storeDir ? "/nix/store"
3
, stateDir ? "/nix/var"
4
, confDir ? "/etc"
···
23
, withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
24
, withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp
25
, enableStatic ? false
26
+
, name, suffix ? "", src, patches ? []
27
28
}:
29
let
30
sh = busybox-sandbox-shell;
31
nix = stdenv.mkDerivation rec {
32
+
inherit name src patches;
33
version = lib.getVersion name;
34
35
is24 = lib.versionAtLeast version "2.4pre";
···
207
rev = "5a6ddb3de14a1684af6c793d663764d093fa7846";
208
sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g";
209
};
210
+
211
+
patches = [
212
+
(fetchpatch { # Fix build on gcc10
213
+
url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch";
214
+
sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y=";
215
+
})
216
+
];
217
218
inherit storeDir stateDir confDir boehmgc;
219
});