mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-08 14:03:29 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
26 lines
947 B
Diff
26 lines
947 B
Diff
From abc5e8786d41803300b56ef40c08db0d867eb01a Mon Sep 17 00:00:00 2001
|
|
From: Christoph Neidahl <christoph.neidahl@gmail.com>
|
|
Date: Sun, 13 Sep 2020 23:22:33 +0200
|
|
Subject: [PATCH 2/2] Prepend libSDL.dylib to macOS SDL loader
|
|
|
|
---
|
|
src/derelict/sdl/sdl.d | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/derelict/sdl/sdl.d b/src/derelict/sdl/sdl.d
|
|
index e31a52f..f7915b1 100644
|
|
--- a/src/derelict/sdl/sdl.d
|
|
+++ b/src/derelict/sdl/sdl.d
|
|
@@ -54,7 +54,7 @@ public:
|
|
super(
|
|
"sdl.dll",
|
|
"libSDL.so, libSDL.so.0, libSDL-1.2.so, libSDL-1.2.so.0",
|
|
- "@executable_path/../Frameworks/SDL.framework/SDL, /Library/Frameworks/SDL.framework/SDL, /System/Library/Frameworks/SDL.framework/SDL"
|
|
+ "@rpath/libSDL.dylib, @executable_path/../Frameworks/SDL.framework/SDL, /Library/Frameworks/SDL.framework/SDL, /System/Library/Frameworks/SDL.framework/SDL"
|
|
);
|
|
}
|
|
|
|
--
|
|
2.25.4
|
|
|