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

Merge pull request #328782 from rhelmot/freebsd-gdb

Browse Source 
gdb + deps: fix build on FreeBSD
This commit is contained in:
John Ericson
2024-07-24 14:05:14 -04:00
committed by GitHub
parent 44afce2cdc beb34f1b96
commit 89af439710
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/libipt/default.nix
+2 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
{ lib, stdenv, fetchFromGitHub, cmake, freebsd }:
stdenv.mkDerivation rec {
pname = "libipt";
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = lib.optional stdenv.isFreeBSD freebsd.libstdthreads;
meta = with lib; {
description = "Intel Processor Trace decoder library";
pkgs/development/libraries/mpfr/default.nix
+4
View File
@@ -3,6 +3,7 @@
, fetchurl
, gmp
, writeScript
, updateAutotoolsGnuConfigScriptsHook
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -25,6 +26,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" "info" ];
strictDeps = true;
# necessary to build on FreeBSD native pending inclusion of
# https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
# mpfr.h requires gmp.h
propagatedBuildInputs = [ gmp ];
pkgs/development/tools/misc/gdb/default.nix
+1 -1
View File
@@ -155,7 +155,7 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl3Plus;
# GDB upstream does not support ARM darwin
platforms = with platforms; linux ++ cygwin ++ ["x86_64-darwin"];
platforms = with platforms; linux ++ cygwin ++ freebsd ++ ["x86_64-darwin"];
maintainers = with maintainers; [ pierron globin lsix ];
};
}
pkgs/os-specific/bsd/freebsd/pkgs/libstdthreads.nix
+5
View File
@@ -0,0 +1,5 @@
{ mkDerivation }:
mkDerivation {
path = "lib/libstdthreads";
extraPaths = [ "lib/libc/Versions.def" ];
}
pkgs/tools/text/source-highlight/default.nix
+4 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchpatch, fetchurl, boost }:
{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook }:
stdenv.mkDerivation rec {
pname = "source-highlight";
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
'';
strictDeps = true;
# necessary to build on FreeBSD native pending inclusion of
# https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
buildInputs = [ boost ];
configureFlags = [