Skip to content

Commit fe78e4c

Browse files
committed
Filter app assets out of 'macBackend' derivation
1 parent adab544 commit fe78e4c

6 files changed

+5
-5
lines changed

default.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ let
99
obApp = import ./obApp.nix args;
1010
pactServerModule = import ./pact-server/service.nix;
1111
macAppName = "Pact";
12-
macAppIcon = ./mac/pact.icns; # Use png2icns to produce this, if needed
13-
macPactDocumentIcon = ./mac/pact-document.icns;
12+
macAppIcon = ./mac/static/pact.icns; # Use png2icns to produce this, if needed
13+
macPactDocumentIcon = ./mac/static/pact-document.icns;
1414
# ^ This can be created in Preview using the system document icon from
1515
# /System/Library/CoreServices/CoreTypes.bundle/Contents/Resources/
1616
# and the pact logo
17-
macAppInstallerBackground = ./mac/installer-background.png;
17+
macAppInstallerBackground = ./mac/static/installer-background.png;
1818
bundleIdentifier = "io.kadena.pact";
1919
createDmg = pkgs.fetchFromGitHub {
2020
owner = "andreyvit";
@@ -140,7 +140,7 @@ in obApp // rec {
140140
ln -s "${obApp.passthru.staticFiles}" "$out/${macAppName}.app/Contents/Resources/static"
141141
ln -s "${macAppIcon}" "$out/${macAppName}.app/Contents/Resources/pact.icns"
142142
ln -s "${macPactDocumentIcon}" "$out/${macAppName}.app/Contents/Resources/pact-document.icns"
143-
ln -s "${./mac/index.html}" "$out/${macAppName}.app/Contents/Resources/index.html"
143+
ln -s "${./mac/static/index.html}" "$out/${macAppName}.app/Contents/Resources/index.html"
144144
ln -s "${sass}/sass.css" "$out/${macAppName}.app/Contents/Resources/sass.css"
145145
cat ${plist} > "$out/${macAppName}.app/Contents/Info.plist"
146146
'';
File renamed without changes.
File renamed without changes.
File renamed without changes.

mac/pact.icns mac/static/pact.icns

File renamed without changes.

obApp.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ in
4242
entropy = hackGet ./deps/entropy;
4343
cardano-crypto = hackGet ./deps/cardano-crypto;
4444
desktop = ./desktop;
45-
mac = ./mac;
45+
mac = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) ["static"])) ./mac;
4646
};
4747

4848
overrides = let

0 commit comments

Comments
 (0)