BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #178370 from trofi/fix-fno-common-for-vscode-extensions.ms-python.python

Browse source 
vscode-extensions.ms-python.python: pull upstream fix for -fno-common…
This commit is contained in:
Sandro 2022-06-21 17:55:04 +02:00 committed by GitHub
commit d31b5b10c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/editors/vscode/extensions/python/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, vscode-utils, extractNuGet
{ lib, stdenv, fetchurl, fetchpatch, vscode-utils, extractNuGet
, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook
, python3, musl
, pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified.
@ -28,6 +28,17 @@ let
url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2";
sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86";
};
patches = (oldAttrs.patches or []) ++ [
# Pull upstream fix for -fno-common toolchain. Without it build fails on
# upstream gcc-10 as:
# ld: libustsnprintf.a(libustsnprintf_la-core.o):snprintf/core.c:23: multiple definition of
# `ust_loglevel'; ustctl.o:liblttng-ust-ctl/ustctl.c:80: first defined here
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/lttng/lttng-ust/commit/21a934df4c683e73e0a66a9afca33573fcf9d789.patch";
sha256 = "122lw9rdmr80gmz7814235ibqs47c6pzvg0ryh01805x0cymx74z";
})
];
});
pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python";