Compare commits

..

No commits in common. "9a271270ad31985af1cec304ae9b7598e1813cc7" and "95fc8fed473d572a4d06c8055e8f5edf590ea95c" have entirely different histories.

5 changed files with 28 additions and 11 deletions

View File

@ -127,12 +127,12 @@ final: prev: {
} // (byName self)) |> final.lib.recurseIntoAttrs;
strawberry = prev.strawberry.overrideAttrs (afinal: aprev: {
version = "1.2.18";
version = "1.2.17";
src = final.fetchFromGitHub {
owner = "jonaski";
repo = "strawberry";
rev = afinal.version;
hash = "sha256-5h1psYJDKnFFgIGZY3ecCttgkR+zuUwa3b/A4keLk9o=";
hash = "sha256-ZyWVOpa1laBUNW5lwbNeAmVBXEOLlXy+Xz8vbtuLi/8=";
};
patches = [
./pkgs/strawberry/0001-make-the-minimum-scrobble-length-shorter.patch

View File

@ -40,6 +40,17 @@ stdenv.mkDerivation (finalAttrs: {
sqlite.out
];
patches = lib.optionals isDarwin [
/*
The entry point binary $out/bin/racket is codesigned at least once. The
following error is triggered as a result.
(error 'add-ad-hoc-signature "file already has a signature")
We always remove the existing signature then call add-ad-hoc-signature to
circumvent this error.
*/
./patches/force-remove-codesign-then-add.patch
];
preConfigure =
/*
The configure script forces using `libtool -o` as AR on Darwin. But, the
@ -160,10 +171,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with lib.maintainers; [ rc-zb ];
mainProgram = "racket";
platforms = lib.platforms.all;
/*
> checking size of void *... 0
> Something has gone wrong getting the pointer size; see config.log
*/
badPlatforms = lib.platforms.darwin;
};
})

View File

@ -15,7 +15,7 @@
libpng,
makeFontsConf,
pango,
unixodbc,
unixODBC,
wrapGAppsHook3,
disableDocs ? false,
@ -38,7 +38,7 @@ minimal.overrideAttrs (
};
buildInputs = prevAttrs.buildInputs ++ [
(if isDarwin then libiodbc else unixodbc)
(if isDarwin then libiodbc else unixODBC)
cairo
fontconfig.lib
glib
@ -133,7 +133,8 @@ minimal.overrideAttrs (
libraries support applications from web servers and databases to
GUIs and charts.
'';
badPlatforms = [];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
};
}
)

View File

@ -0,0 +1,10 @@
--- old/src/mac/codesign.rkt
+++ new/src/mac/codesign.rkt
@@ -18,6 +18,6 @@
file))
(void
- (if remove?
+ (begin
(remove-signature file)
(add-ad-hoc-signature file)))

View File

@ -49,7 +49,7 @@ down_page_path = homepage.find(
down_page = BeautifulSoup(requests.get(SITE + "/" + down_page_path).text, "html.parser")
down_table = down_page.find(class_="download-table")
full = find_info(down_table, "Racket", "All Platforms")
full = find_info(down_table, "Racket", "Unix")
minimal = find_info(down_table, "Minimal Racket", "All Platforms")
with open(MANIFEST_FILENAME, "w", encoding="utf-8") as f: