mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-28 07:43:43 +00:00
ce789e7e35
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git. - remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required. - fixes https://github.com/NixOS/nixpkgs/issues/166205 - provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640 - pkgsCross.x86_64-freebsd builds work again This change can be represented in 3 stages 1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi} 2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin} 3. remove all references to libcxxabi outside of llvm (about 58 packages modified) ### merging libcxxabi into libcxx - take the union of the libcxxabi and libcxx cmake flags - eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency - libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx. - darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient. - linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient. - libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+) - git/libcxx/defaul.nix does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway. ### stdenv changes - darwin bootstrap, remove references to libcxxabi and cxxabi - cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12) - adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx ### 58 package updates - remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed - swift, nodejs_v8 remove libcxxabi references in the clang override https://github.com/NixOS/nixpkgs/pull/292043
82 lines
2.0 KiB
Nix
82 lines
2.0 KiB
Nix
{ lib
|
|
, buildGoModule
|
|
, fetchFromGitHub
|
|
, pkg-config
|
|
, moreutils
|
|
, libGL
|
|
, libX11
|
|
, libXcursor
|
|
, libXrandr
|
|
, libXinerama
|
|
, libXi
|
|
, libXxf86vm
|
|
, mupdf
|
|
, fontconfig
|
|
, freetype
|
|
, stdenv
|
|
, darwin
|
|
, nix-update-script
|
|
}:
|
|
|
|
buildGoModule rec {
|
|
pname = "gcs";
|
|
version = "5.20.4";
|
|
|
|
src = fetchFromGitHub {
|
|
owner = "richardwilkes";
|
|
repo = "gcs";
|
|
rev = "v${version}";
|
|
hash = "sha256-aoU2wRz2XB6+3e6am/dLjRbcDmWTjtDtTBwc6c4n3DE=";
|
|
};
|
|
|
|
modPostBuild = ''
|
|
chmod +w vendor/github.com/richardwilkes/pdf
|
|
sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go
|
|
'';
|
|
|
|
vendorHash = "sha256-ee6qvwnUXtsBcovPOORfVpdndICtIUYe4GrP52V/P3k=";
|
|
|
|
nativeBuildInputs = [ pkg-config moreutils ];
|
|
|
|
buildInputs = [
|
|
libGL
|
|
libX11
|
|
libXcursor
|
|
libXrandr
|
|
libXinerama
|
|
libXi
|
|
libXxf86vm
|
|
mupdf
|
|
fontconfig
|
|
freetype
|
|
] ++ lib.optionals stdenv.isDarwin [
|
|
darwin.apple_sdk_11_0.frameworks.Carbon
|
|
darwin.apple_sdk_11_0.frameworks.Cocoa
|
|
darwin.apple_sdk_11_0.frameworks.Kernel
|
|
];
|
|
|
|
# flags are based on https://github.com/richardwilkes/gcs/blob/master/build.sh
|
|
flags = [ "-a -trimpath" ];
|
|
ldflags = [ "-s" "-w" "-X github.com/richardwilkes/toolbox/cmdline.AppVersion=${version}" ];
|
|
|
|
installPhase = ''
|
|
runHook preInstall
|
|
install -Dm755 $GOPATH/bin/gcs -t $out/bin
|
|
runHook postInstall
|
|
'';
|
|
|
|
passthru.updateScript = nix-update-script { };
|
|
|
|
meta = {
|
|
changelog = "https://github.com/richardwilkes/gcs/releases/tag/${src.rev}";
|
|
description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system";
|
|
homepage = "https://gurpscharactersheet.com/";
|
|
license = lib.licenses.mpl20;
|
|
mainProgram = "gcs";
|
|
maintainers = with lib.maintainers; [ tomasajt ];
|
|
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
|
# incompatible vendor/github.com/richardwilkes/unison/internal/skia/libskia_linux.a
|
|
broken = stdenv.isLinux && stdenv.isAarch64;
|
|
};
|
|
}
|