Skip to content

drop stdPath #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrshmllow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

drop stdPath #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 17 additions & 34 deletions overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,21 @@
{
flake.overlays.default =
_final: prev:
withSystem prev.stdenv.hostPlatform.system (
_:
let
stdPath = pkgs: [
pkgs.zenity
pkgs.curl

pkgs.zstd
pkgs.coreutils
pkgs.gnused
pkgs.gnugrep
pkgs.wget

pkgs.busybox
];
in
{
affinity-v3 = prev.callPackage ./packages/affinity-v3/package.nix {
inherit inputs stdPath;
};
affinity-photo = prev.callPackage ./packages/affinity/package.nix {
name = "Photo";
inherit inputs stdPath;
};
affinity-designer = prev.callPackage ./packages/affinity/package.nix {
name = "Designer";
inherit inputs stdPath;
};
affinity-publisher = prev.callPackage ./packages/affinity/package.nix {
name = "Publisher";
inherit inputs stdPath;
};
}
);
withSystem prev.stdenv.hostPlatform.system (_: {
affinity-v3 = prev.callPackage ./packages/affinity-v3/package.nix {
inherit inputs;
};
affinity-photo = prev.callPackage ./packages/affinity/package.nix {
name = "Photo";
inherit inputs;
};
affinity-designer = prev.callPackage ./packages/affinity/package.nix {
name = "Designer";
inherit inputs;
};
affinity-publisher = prev.callPackage ./packages/affinity/package.nix {
name = "Publisher";
inherit inputs;
};
});
}
3 changes: 1 addition & 2 deletions packages/affinity-v3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{
pkgs,
lib,
stdPath,
self',
warnUnfree,
...
Expand All @@ -13,7 +12,7 @@
packages = {
affinity-v3 = warnUnfree (
pkgs.callPackage ./package.nix {
inherit inputs stdPath;
inherit inputs;
}
);

Expand Down
3 changes: 1 addition & 2 deletions packages/affinity-v3/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
callPackage,
stdenv,
inputs,
stdPath,
lib,
...
}:
let
wine-packages = callPackage ../wine/packages.nix {
inherit inputs stdPath;
inherit inputs;
};

apl-combined = callPackage ../apl/apl-combined.nix {
Expand Down
3 changes: 1 addition & 2 deletions packages/affinity/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{
pkgs,
lib,
stdPath,
self',
warnUnfree,
...
Expand All @@ -19,7 +18,7 @@
name:
warnUnfree (
pkgs.callPackage ./package.nix {
inherit inputs stdPath name;
inherit inputs name;
}
);
in
Expand Down
3 changes: 1 addition & 2 deletions packages/affinity/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
name,
stdenv,
inputs,
stdPath,
...
}:
let
wine-packages = callPackage ../wine/packages.nix {
inherit inputs stdPath;
inherit inputs;
};

apl-combined = callPackage ../apl/apl-combined.nix {
Expand Down
13 changes: 0 additions & 13 deletions packages/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,6 @@
};

_module.args = {
stdPath = pkgs: [
pkgs.zenity
pkgs.curl

pkgs.zstd
pkgs.coreutils
pkgs.gnused
pkgs.gnugrep
pkgs.wget

pkgs.busybox
];

warnUnfree =
pkg:
lib.warn "For users of affinity-nix through NixOS, Home Manager, nix-darwin, or similar: please switch to consuming this package through the `affinity-nix.overlays.default` overlay. It will become `unfree` in the future, making it impossible to declaratively consume without an overlay." pkg;
Expand Down
3 changes: 1 addition & 2 deletions packages/wine/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
perSystem =
{
pkgs,
stdPath,
...
}:
let
wine-packages = pkgs.callPackage ./packages.nix {
inherit stdPath inputs;
inherit inputs;
};
in
{
Expand Down
3 changes: 1 addition & 2 deletions packages/wine/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
callPackage,
pkgs,
inputs,
stdPath,
...
}:
let
wineUnstable =
Expand All @@ -23,7 +23,6 @@ let

wrapWithPrefix = callPackage ./wrapWithPrefix.nix {
inherit wineUnwrapped;
stdPath = stdPath pkgs;
};
in
{
Expand Down
4 changes: 1 addition & 3 deletions packages/wine/wrapWithPrefix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
lib,
pkgs,
wineUnwrapped,
stdPath,
}:
pkg: pname:
stdenv.mkDerivation rec {
Expand All @@ -16,8 +15,7 @@ stdenv.mkDerivation rec {
--set WINESERVER "${lib.getExe' wineUnwrapped "wineserver"}" \
--set WINELOADER "${lib.getExe' wineUnwrapped "wine"}" \
--set WINEDLLPATH "${wineUnwrapped}/lib/wine" \
--set WINE "${lib.getExe' wineUnwrapped "wine"}" \
--set PATH "${lib.makeBinPath stdPath}"
--set WINE "${lib.getExe' wineUnwrapped "wine"}"
'';
meta.mainProgram = name;
}
Loading