calamares-nixos: convert to wrapper

K900 92eee7ea a5fae155

+30 -8
+30
pkgs/by-name/ca/calamares-nixos/package.nix
···
··· 1 + { 2 + lib, 3 + runCommand, 4 + makeWrapper, 5 + calamares, 6 + calamares-nixos-extensions, 7 + }: 8 + runCommand "calamares-wrapped" 9 + { 10 + inherit (calamares) version meta; 11 + 12 + nativeBuildInputs = [ makeWrapper ]; 13 + } 14 + '' 15 + mkdir -p $out/bin 16 + 17 + cd ${calamares} 18 + 19 + for i in *; do 20 + if [ "$i" == "bin" ]; then 21 + continue 22 + fi 23 + ln -s ${calamares}/$i $out/$i 24 + done 25 + 26 + makeWrapper ${lib.getExe calamares} $out/bin/calamares \ 27 + --prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share \ 28 + --prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc \ 29 + --add-flag --xdg-config 30 + ''
-7
pkgs/by-name/ca/calamares/package.nix
··· 19 os-prober, 20 xkeyboard_config, 21 22 - nixos-extensions ? false, 23 # passthru.tests 24 calamares-nixos, 25 - calamares-nixos-extensions, 26 }: 27 28 stdenv.mkDerivation (finalAttrs: { ··· 101 util-linux 102 ] 103 }" 104 - ] 105 - ++ lib.optionals nixos-extensions [ 106 - "--prefix XDG_DATA_DIRS : ${calamares-nixos-extensions}/share" 107 - "--prefix XDG_CONFIG_DIRS : ${calamares-nixos-extensions}/etc" 108 - "--add-flag --xdg-config" 109 ]; 110 111 passthru.tests = {
··· 19 os-prober, 20 xkeyboard_config, 21 22 # passthru.tests 23 calamares-nixos, 24 }: 25 26 stdenv.mkDerivation (finalAttrs: { ··· 99 util-linux 100 ] 101 }" 102 ]; 103 104 passthru.tests = {
-1
pkgs/top-level/all-packages.nix
··· 1904 ''; 1905 }); 1906 1907 - calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; }); 1908 candle = libsForQt5.callPackage ../applications/misc/candle { }; 1909 1910 capstone = callPackage ../development/libraries/capstone { };
··· 1904 ''; 1905 }); 1906 1907 candle = libsForQt5.callPackage ../applications/misc/candle { }; 1908 1909 capstone = callPackage ../development/libraries/capstone { };