diff options
Diffstat (limited to 'pkgs/development')
4 files changed, 94 insertions, 4 deletions
diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix new file mode 100644 index 0000000000000..629e5465a0444 --- /dev/null +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -0,0 +1,80 @@ +{ lib, gcc9Stdenv, fetchFromGitHub, runCommand, cosmopolitan }: + +gcc9Stdenv.mkDerivation rec { + pname = "cosmopolitan"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "jart"; + repo = "cosmopolitan"; + rev = version; + sha256 = "sha256-OVdOObO82W6JN63OWKHaERS7y0uvgxt+WLp6Y0LsmJk="; + }; + + postPatch = '' + patchShebangs build/ + rm -r third_party/gcc + ''; + + dontConfigure = true; + dontFixup = true; + enableParallelBuilding = true; + + preBuild = '' + makeFlagsArray=( + SHELL=/bin/sh + AS=${gcc9Stdenv.cc.targetPrefix}as + CC=${gcc9Stdenv.cc.targetPrefix}gcc + GCC=${gcc9Stdenv.cc.targetPrefix}gcc + CXX=${gcc9Stdenv.cc.targetPrefix}g++ + LD=${gcc9Stdenv.cc.targetPrefix}ld + OBJCOPY=${gcc9Stdenv.cc.targetPrefix}objcopy + "MKDIR=mkdir -p" + ) + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib/include} + install o/cosmopolitan.h $out/lib/include + install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib + cat > $out/bin/cosmoc <<EOF + #!${gcc9Stdenv.shell} + exec ${gcc9Stdenv.cc}/bin/${gcc9Stdenv.cc.targetPrefix}gcc \ + -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ + "\$@" \ + -Wl,--oformat=binary -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \ + -fuse-ld=bfd -Wl,-T,$out/lib/ape.lds \ + -include $out/lib/{include/cosmopolitan.h,crt.o,ape.o,cosmopolitan.a} + EOF + chmod +x $out/bin/cosmoc + runHook postInstall + ''; + + passthru.tests = lib.optional (gcc9Stdenv.buildPlatform == gcc9Stdenv.hostPlatform) { + hello = runCommand "hello-world" { } '' + printf 'main() { printf("hello world\\n"); }\n' >hello.c + ${gcc9Stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ + -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ + -include ${cosmopolitan}/lib/{include/cosmopolitan.h,crt.o,ape.o,cosmopolitan.a} + ${gcc9Stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com + ./hello.com + printf "test successful" > $out + ''; + cosmoc = runCommand "cosmoc-hello" { } '' + printf 'main() { printf("hello world\\n"); }\n' >hello.c + ${cosmopolitan}/bin/cosmoc hello.c + ./a.out + printf "test successful" > $out + ''; + }; + + meta = with lib; { + homepage = "https://justine.lol/cosmopolitan/"; + description = "Your build-once run-anywhere c library"; + platforms = platforms.x86_64; + badPlatforms = platforms.darwin; + license = licenses.isc; + maintainers = with maintainers; [ lourkeur tomberek ]; + }; +} diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 778b61d831586..8754dd5f65d2c 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "11x8q45jvjvf2dvgclds64mscyg10lva33qinf2hwgc84v3svf1l"; }; + outputs = [ "out" "dev" "man" ]; + # darwin changes configure.ac which means we need to regenerate # the configure scripts nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 04c494403be28..e8a50f45119e8 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -2,13 +2,15 @@ buildDunePackage rec { pname = "safepass"; - version = "3.0"; + version = "3.1"; + + useDune2 = true; src = fetchFromGitHub { owner = "darioteixeira"; repo = "ocaml-safepass"; rev = "v${version}"; - sha256 = "0i127gs9x23wzwa1q3dxa2j6hby07hvxdg1c98fc3j09rg6vy2bs"; + sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q"; }; meta = { diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index a7188a3103f4b..8f946c47786d8 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi, + fetchpatch, cairosvg, pyphen, cffi, @@ -7,7 +8,6 @@ lxml, html5lib, tinycss, - pygobject2, glib, pango, fontconfig, @@ -43,9 +43,15 @@ buildPythonPackage rec { FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss pygobject2 ]; + propagatedBuildInputs = [ cairosvg pyphen cffi cssselect lxml html5lib tinycss ]; + # 47043a1fd7e50a892b9836466f521df85d597c4.patch can be removed after next release of weasyprint, see: + # https://github.com/Kozea/WeasyPrint/issues/1333#issuecomment-818062970 patches = [ + (fetchpatch { + url = "https://github.com/Kozea/WeasyPrint/commit/47043a1fd7e50a892b9836466f521df85d597c44.patch"; + sha256 = "0l9z0hrav3bcdajlg3vbzljq0lkw7hlj8ppzrq3v21hbj1il1nsb"; + }) (substituteAll { src = ./library-paths.patch; fontconfig = "${fontconfig.lib}/lib/libfontconfig${stdenv.hostPlatform.extensions.sharedLibrary}"; |