Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
polybluez committed Jan 18, 2025
1 parent b804f21 commit 0430e25
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
run: |
NIXPKGS_REV=$(nix flake metadata . --json 2>/dev/null | jq --raw-output '.locks.nodes."nixpkgs".locked.rev')
echo "NIXPKGS_REV=$NIXPKGS_REV" >> "$GITHUB_ENV"
- name: Build fpc-3_2_2
- name: Build fpc
run: |
nix build --inputs-from . --verbose --show-trace --print-build-logs --print-out-paths .#universal.__archPkgs.fpc-3_2_2
- name: Build lazarus-3_6
nix build --inputs-from . --verbose --show-trace --print-build-logs --print-out-paths .#universal.__archPkgs.fpc
- name: Build lazarus
run: |
nix build --inputs-from . --verbose --show-trace --print-build-logs --print-out-paths .#universal.__archPkgs.lazarus-3_6
nix build --inputs-from . --verbose --show-trace --print-build-logs --print-out-paths .#universal.__archPkgs.lazarus
- name: Build assets
run: |
nix build --inputs-from . --verbose --show-trace --print-build-logs --print-out-paths .#assets.x86_64-linux.defaultAssetsPath
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Checks
name: Run checks

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Create a snapshot release

on:
workflow_dispatch:
Expand Down
1 change: 0 additions & 1 deletion fpc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ in rec {
'';

buildInputs = [
# we need gtk2 unconditionally as that is the default target when building applications with lazarus
fpc
];

Expand Down
2 changes: 1 addition & 1 deletion packages/executables.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
fpc-3_0_4 = fpcWrapper universal.fpc-3_0_4;
fpc-3_2_2 = fpcWrapper universal.fpc-3_2_2;
fpc-trunk = fpcWrapper universal.fpc-trunk;
fpc = fpcWrapper universal.fpc-trunk;
fpc = fpcWrapper universal.fpc;
lazarus-trunk =
if (archAttrs.infoAttrs.fpcAttrs.lazarusExists)
then
Expand Down

0 comments on commit 0430e25

Please sign in to comment.