calamares-nixos: convert to wrapper

This commit is contained in:
K900
2025-08-10 10:19:15 +03:00
parent a5fae1552f
commit 92eee7ea76
3 changed files with 30 additions and 8 deletions
@@ -0,0 +1,30 @@
{
lib,
runCommand,
makeWrapper,
calamares,
calamares-nixos-extensions,
}:
runCommand "calamares-wrapped"
{
inherit (calamares) version meta;
nativeBuildInputs = [ makeWrapper ];
}
''
mkdir -p $out/bin
cd ${calamares}
for i in *; do
if [ "$i" == "bin" ]; then
continue
fi
ln -s ${calamares}/$i $out/$i
done
makeWrapper ${lib.getExe calamares} $out/bin/calamares \
--prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share \
--prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc \
--add-flag --xdg-config
''
-7
View File
@@ -19,10 +19,8 @@
os-prober,
xkeyboard_config,
nixos-extensions ? false,
# passthru.tests
calamares-nixos,
calamares-nixos-extensions,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -101,11 +99,6 @@ stdenv.mkDerivation (finalAttrs: {
util-linux
]
}"
]
++ lib.optionals nixos-extensions [
"--prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share"
"--prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc"
"--add-flag --xdg-config"
];
passthru.tests = {
-1
View File
@@ -1904,7 +1904,6 @@ with pkgs;
'';
});
calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });
candle = libsForQt5.callPackage ../applications/misc/candle { };
capstone = callPackage ../development/libraries/capstone { };