From 1754276528ef42304aa3b689969b3d97d2d13844 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 26 Sep 2022 23:42:22 -0400 Subject: [PATCH] treewide: runCommandNoCC -> runCommand *sighs* --- boot/error/default.nix | 4 ++-- boot/recovery-menu/default.nix | 2 +- boot/splash/default.nix | 4 ++-- devices/asus-dumo/firmware/default.nix | 4 ++-- devices/asus-z00t/firmware/default.nix | 4 ++-- devices/google-marlin/firmware/default.nix | 4 ++-- devices/motorola-addison/firmware/default.nix | 4 ++-- devices/motorola-potter/firmware/default.nix | 4 ++-- devices/motorola-rav/firmware/default.nix | 4 ++-- devices/oneplus-oneplus3/firmware/default.nix | 4 ++-- devices/pine64-pinephone/firmware/default.nix | 4 ++-- devices/pine64-pinetab/firmware/default.nix | 4 ++-- devices/samsung-a5y17lte/firmware/default.nix | 4 ++-- doc/_support/devices/default.nix | 4 ++-- doc/_support/options/default.nix | 4 ++-- examples/demo/configuration.nix | 8 ++++---- examples/demo/workaround-v4l_id-hang.nix | 2 +- examples/hello/workaround-v4l_id-hang.nix | 2 +- examples/target-disk-mode/configuration.nix | 2 +- lib/image-builder/in-depth-tests/raspi-like.nix | 2 +- lib/image-builder/tests/alignment/aligned.nix | 2 +- lib/image-builder/tests/alignment/unaligned.nix | 2 +- lib/image-builder/tests/filesystems/default.nix | 2 +- .../tests/filesystems/default_with_files.nix | 2 +- modules/cross-workarounds.nix | 2 +- modules/initrd-boot-gui.nix | 2 +- modules/initrd-kernel.nix | 6 +++--- modules/initrd.nix | 12 ++++++------ modules/stage-0.nix | 2 +- modules/system-build.nix | 2 +- modules/system-types/android/bootimg.nix | 2 +- modules/system-types/android/default.nix | 2 +- .../system-types/depthcharge/depthcharge-build.nix | 6 +++--- modules/system-types/u-boot/default.nix | 4 ++-- modules/system-types/uefi/default.nix | 4 ++-- .../android-flashable-zip/make-flashable-zip.nix | 4 ++-- overlay/mobile-nixos/cross-canary/test.nix | 4 ++-- overlay/mobile-nixos/fdt-forward/default.nix | 4 ++-- overlay/mobile-nixos/gui-assets/default.nix | 4 ++-- overlay/mobile-nixos/lvgui/default.nix | 4 ++-- overlay/mobile-nixos/map-dtbs/default.nix | 4 ++-- 41 files changed, 75 insertions(+), 75 deletions(-) diff --git a/boot/error/default.nix b/boot/error/default.nix index b1591572..5a2f20ff 100644 --- a/boot/error/default.nix +++ b/boot/error/default.nix @@ -1,7 +1,7 @@ -{ lib, runCommandNoCC, mobile-nixos }: +{ lib, runCommand, mobile-nixos }: let - assets = runCommandNoCC "boot-error-assets" {} '' + assets = runCommand "boot-error-assets" {} '' mkdir -p $out cp ${../../artwork/sad.svg} $out/sad.svg ''; diff --git a/boot/recovery-menu/default.nix b/boot/recovery-menu/default.nix index ca526af7..79ae3d7b 100644 --- a/boot/recovery-menu/default.nix +++ b/boot/recovery-menu/default.nix @@ -1,4 +1,4 @@ -{ lib, runCommandNoCC, mobile-nixos }: +{ lib, runCommand, mobile-nixos }: mobile-nixos.mkLVGUIApp { name = "boot-recovery-menu.mrb"; diff --git a/boot/splash/default.nix b/boot/splash/default.nix index 4f802510..316c7536 100644 --- a/boot/splash/default.nix +++ b/boot/splash/default.nix @@ -1,7 +1,7 @@ -{ lib, runCommandNoCC, mobile-nixos }: +{ lib, runCommand, mobile-nixos }: let - assets = runCommandNoCC "boot-splash-assets" {} '' + assets = runCommand "boot-splash-assets" {} '' mkdir -p $out cp ${../../artwork/logo/logo.white.svg} $out/logo.svg ''; diff --git a/devices/asus-dumo/firmware/default.nix b/devices/asus-dumo/firmware/default.nix index 151d49fd..27e5517c 100644 --- a/devices/asus-dumo/firmware/default.nix +++ b/devices/asus-dumo/firmware/default.nix @@ -1,10 +1,10 @@ { lib -, runCommandNoCC +, runCommand , firmwareLinuxNonfree }: # The minimum set of firmware files required for the device. -runCommandNoCC "asus-dumo-firmware" { +runCommand "asus-dumo-firmware" { src = firmwareLinuxNonfree; } '' for firmware in \ diff --git a/devices/asus-z00t/firmware/default.nix b/devices/asus-z00t/firmware/default.nix index 70d2adbd..faff3980 100644 --- a/devices/asus-z00t/firmware/default.nix +++ b/devices/asus-z00t/firmware/default.nix @@ -1,4 +1,4 @@ -{ lib, runCommandNoCC, fetchFromGitHub, fetchurl }: +{ lib, runCommand, fetchFromGitHub, fetchurl }: let # This is a known good dump of the files as present on a running LineageOS system. @@ -15,7 +15,7 @@ let sha256 = "16g5qgvxc3j2ra76hs4ff7h97i7wvk26kg0wbdb6l6qj0i7vml1h"; }; in -runCommandNoCC "asus-z00t-firmware" { +runCommand "asus-z00t-firmware" { inherit src cfg; meta.license = [ # We make no claims that it can be redistributed. diff --git a/devices/google-marlin/firmware/default.nix b/devices/google-marlin/firmware/default.nix index c6202269..48e6314d 100644 --- a/devices/google-marlin/firmware/default.nix +++ b/devices/google-marlin/firmware/default.nix @@ -1,5 +1,5 @@ { lib -, runCommandNoCC +, runCommand , fetchurl , fetchgit , unzip @@ -13,7 +13,7 @@ let url = "https://dl.google.com/dl/android/aosp/marlin-${buildID}-factory-bef66533.zip"; sha256 = "bef6653301371b66bd7fca968cf52013c0bf6862f0c7a70a275b0f0d45ab3888"; }; -in runCommandNoCC "google-marlin-firmware" { +in runCommand "google-marlin-firmware" { nativeBuildInputs = [ unzip e2fsprogs simg2img ]; meta.license = [ # We make no claims that it can be redistributed. diff --git a/devices/motorola-addison/firmware/default.nix b/devices/motorola-addison/firmware/default.nix index 9c58561a..f04d4203 100644 --- a/devices/motorola-addison/firmware/default.nix +++ b/devices/motorola-addison/firmware/default.nix @@ -1,5 +1,5 @@ { lib -, runCommandNoCC +, runCommand , fetchFromGitHub , fetchurl , modem ? builtins.throw '' @@ -35,7 +35,7 @@ let inherit sha256; }; in -runCommandNoCC "motorola-addison-firmware" { +runCommand "motorola-addison-firmware" { inherit modem cfg dict nv; meta.license = [ # We make no claims that it can be redistributed. diff --git a/devices/motorola-potter/firmware/default.nix b/devices/motorola-potter/firmware/default.nix index efbf2b9d..9432e563 100644 --- a/devices/motorola-potter/firmware/default.nix +++ b/devices/motorola-potter/firmware/default.nix @@ -1,5 +1,5 @@ { lib -, runCommandNoCC +, runCommand , fetchFromGitHub , fetchurl , modem ? builtins.throw '' @@ -35,7 +35,7 @@ let inherit sha256; }; in -runCommandNoCC "motorola-potter-firmware" { +runCommand "motorola-potter-firmware" { inherit modem cfg dict nv; meta.license = [ # We make no claims that it can be redistributed. diff --git a/devices/motorola-rav/firmware/default.nix b/devices/motorola-rav/firmware/default.nix index cafaec55..78af9a55 100644 --- a/devices/motorola-rav/firmware/default.nix +++ b/devices/motorola-rav/firmware/default.nix @@ -1,5 +1,5 @@ { lib -, runCommandNoCC +, runCommand , fetchurl , fetchgit , unzip @@ -15,7 +15,7 @@ let url = "https://archive.org/download/xt-2045-3-rav-retus-10-qpjs-30.131-61-8-subsidy-default-regulatory-default-cfc.xml/${factoryZip}"; sha256 = "0fjrwpazd7p9nlrmbl616n86hsnv1a57piyxsifsnwb3hm90jqhr"; }; -in runCommandNoCC "motorola-rav-firmware-${buildTag}" { +in runCommand "motorola-rav-firmware-${buildTag}" { nativeBuildInputs = [ unzip e2fsprogs simg2img android-partition-tools ]; meta.license = [ # We make no claims that it can be redistributed. diff --git a/devices/oneplus-oneplus3/firmware/default.nix b/devices/oneplus-oneplus3/firmware/default.nix index 34f20813..c4b4b9d1 100644 --- a/devices/oneplus-oneplus3/firmware/default.nix +++ b/devices/oneplus-oneplus3/firmware/default.nix @@ -1,5 +1,5 @@ { lib -, runCommandNoCC +, runCommand , fetchFromGitHub , fetchurl , modem ? builtins.throw '' @@ -27,7 +27,7 @@ let sha256 = "1pcq64r4ag6rcgkbq3j2b43xzia9ccwbdgkgslw6pfqq8bmvcwxy"; }; in -runCommandNoCC "oneplus-oneplus3-firmware" { +runCommand "oneplus-oneplus3-firmware" { inherit modem cfg; meta.license = [ # We make no claims that it can be redistributed. diff --git a/devices/pine64-pinephone/firmware/default.nix b/devices/pine64-pinephone/firmware/default.nix index 5d03181b..fd76c23e 100644 --- a/devices/pine64-pinephone/firmware/default.nix +++ b/devices/pine64-pinephone/firmware/default.nix @@ -1,10 +1,10 @@ { lib -, runCommandNoCC +, runCommand , fetchgit }: # The minimum set of firmware files required for the device. -runCommandNoCC "pine64-pinephone-firmware" { +runCommand "pine64-pinephone-firmware" { src = fetchgit { url = "https://megous.com/git/linux-firmware"; rev = "6e8e591e17e207644dfe747e51026967bb1edab5"; diff --git a/devices/pine64-pinetab/firmware/default.nix b/devices/pine64-pinetab/firmware/default.nix index 2567a36a..dd60a86a 100644 --- a/devices/pine64-pinetab/firmware/default.nix +++ b/devices/pine64-pinetab/firmware/default.nix @@ -1,10 +1,10 @@ { lib -, runCommandNoCC +, runCommand , fetchFromGitHub }: # The minimum set of firmware files required for the device. -runCommandNoCC "pine64-pinetab-firmware" { +runCommand "pine64-pinetab-firmware" { src = fetchFromGitHub { owner = "anarsoul"; repo = "rtl8723bt-firmware"; diff --git a/devices/samsung-a5y17lte/firmware/default.nix b/devices/samsung-a5y17lte/firmware/default.nix index d42748e1..6fbd32d5 100644 --- a/devices/samsung-a5y17lte/firmware/default.nix +++ b/devices/samsung-a5y17lte/firmware/default.nix @@ -1,5 +1,5 @@ { lib -, runCommandNoCC +, runCommand , fetchurl }: @@ -39,7 +39,7 @@ let }).overrideAttrs(_: { inherit path; }); in -runCommandNoCC "samsung-a5y17lte-firmware" { +runCommand "samsung-a5y17lte-firmware" { meta.license = [ # We make no claims that it can be redistributed. lib.licenses.unfree diff --git a/doc/_support/devices/default.nix b/doc/_support/devices/default.nix index 57c9ace5..364d1270 100644 --- a/doc/_support/devices/default.nix +++ b/doc/_support/devices/default.nix @@ -1,7 +1,7 @@ { pkgs , stdenv , glibcLocales -, runCommandNoCC +, runCommand , symlinkJoin , ruby }: @@ -19,7 +19,7 @@ let }; in -runCommandNoCC "mobile-nixos-docs-devices" { +runCommand "mobile-nixos-docs-devices" { nativeBuildInputs = [ ruby glibcLocales diff --git a/doc/_support/options/default.nix b/doc/_support/options/default.nix index 375d84c7..824365fb 100644 --- a/doc/_support/options/default.nix +++ b/doc/_support/options/default.nix @@ -1,7 +1,7 @@ { pkgs , glibcLocales , nixosOptionsDoc -, runCommandNoCC +, runCommand , ruby }: @@ -33,7 +33,7 @@ let optionsJSON = (nixosOptionsDoc { options = dummyEval.options; }).optionsJSON; in -runCommandNoCC "mobile-nixos-docs-options" { +runCommand "mobile-nixos-docs-options" { nativeBuildInputs = [ ruby glibcLocales diff --git a/examples/demo/configuration.nix b/examples/demo/configuration.nix index a9c1dae5..146731be 100644 --- a/examples/demo/configuration.nix +++ b/examples/demo/configuration.nix @@ -12,7 +12,7 @@ let # rendering might not be as expected depending on what renders it. # The SVGs in that directory are used as an authoring format files, not files # to be used as they are. They need to be pre-rendered. - wallpapers = pkgs.runCommandNoCC "wallpapers" {} '' + wallpapers = pkgs.runCommand "wallpapers" {} '' mkdir -p $out/ cp ${../../artwork/wallpapers}/*.png $out/ ''; @@ -146,7 +146,7 @@ in environment.etc."xdg/xfce4" = { # TODO: DPI/size settings, so that a DPI can be derived from the device info. - source = pkgs.runCommandNoCC "xfce4-defaults" {} '' + source = pkgs.runCommand "xfce4-defaults" {} '' cp -r ${./xdg/xfce4} $out wallpaper="${wallpapers}/mobile-nixos-19.09.png" substituteInPlace $out/xfconf/xfce-perchannel-xml/xfce4-desktop.xml \ @@ -178,7 +178,7 @@ in in [ awesome - (runCommandNoCC "awesome-actions" {} '' + (runCommand "awesome-actions" {} '' mkdir -vp $out/share/applications/ (cd $out/share/applications/ cat > awesome-close.desktop < $out echo "X-XFCE-Autostart-Override=true" >> $out substituteInPlace $out \ diff --git a/examples/demo/workaround-v4l_id-hang.nix b/examples/demo/workaround-v4l_id-hang.nix index 2bad2897..d802826f 100644 --- a/examples/demo/workaround-v4l_id-hang.nix +++ b/examples/demo/workaround-v4l_id-hang.nix @@ -5,7 +5,7 @@ { pkgs, lib, ... }: let - emptyV4lRules = pkgs.runCommandNoCC "empty-v4l-rules" {} '' + emptyV4lRules = pkgs.runCommand "empty-v4l-rules" {} '' mkdir -p $out/lib/udev/rules.d touch $out/lib/udev/rules.d/60-persistent-v4l.rules ''; diff --git a/examples/hello/workaround-v4l_id-hang.nix b/examples/hello/workaround-v4l_id-hang.nix index 2bad2897..d802826f 100644 --- a/examples/hello/workaround-v4l_id-hang.nix +++ b/examples/hello/workaround-v4l_id-hang.nix @@ -5,7 +5,7 @@ { pkgs, lib, ... }: let - emptyV4lRules = pkgs.runCommandNoCC "empty-v4l-rules" {} '' + emptyV4lRules = pkgs.runCommand "empty-v4l-rules" {} '' mkdir -p $out/lib/udev/rules.d touch $out/lib/udev/rules.d/60-persistent-v4l.rules ''; diff --git a/examples/target-disk-mode/configuration.nix b/examples/target-disk-mode/configuration.nix index 46470371..532aca3c 100644 --- a/examples/target-disk-mode/configuration.nix +++ b/examples/target-disk-mode/configuration.nix @@ -49,7 +49,7 @@ in # Replaces the rootfs with a generated empty disk. # Ideally we'd have `lib.mkDelete` here, but that doesn't exist. rootfs = lib.mkForce { - raw = pkgs.runCommandNoCC "empty" { + raw = pkgs.runCommand "empty" { filename = "empty.img"; partitionType = "0FC63DAF-8483-4772-8E79-3D69D8477DE4"; length = 1024; diff --git a/lib/image-builder/in-depth-tests/raspi-like.nix b/lib/image-builder/in-depth-tests/raspi-like.nix index c1d6d1b5..429a6272 100644 --- a/lib/image-builder/in-depth-tests/raspi-like.nix +++ b/lib/image-builder/in-depth-tests/raspi-like.nix @@ -32,7 +32,7 @@ let booti $kernel_addr_r ''; - scr = pkgs.runCommandNoCC "uboot-script" {} '' + scr = pkgs.runCommand "uboot-script" {} '' mkdir -p $out ${ubootTools}/bin/mkimage \ -A arm64 \ diff --git a/lib/image-builder/tests/alignment/aligned.nix b/lib/image-builder/tests/alignment/aligned.nix index 61d12179..aad766bd 100644 --- a/lib/image-builder/tests/alignment/aligned.nix +++ b/lib/image-builder/tests/alignment/aligned.nix @@ -3,7 +3,7 @@ let inherit (pkgs) imageBuilder; - makeNull = size: pkgs.runCommandNoCC "filesystems-test" { + makeNull = size: pkgs.runCommand "filesystems-test" { filename = "null.img"; filesystemType = "FAT32"; # meh, good enough } '' diff --git a/lib/image-builder/tests/alignment/unaligned.nix b/lib/image-builder/tests/alignment/unaligned.nix index 3dc910e5..8eed6c1e 100644 --- a/lib/image-builder/tests/alignment/unaligned.nix +++ b/lib/image-builder/tests/alignment/unaligned.nix @@ -3,7 +3,7 @@ let inherit (pkgs) imageBuilder; - makeNull = size: pkgs.runCommandNoCC "filesystems-test" { + makeNull = size: pkgs.runCommand "filesystems-test" { filename = "null.img"; filesystemType = "FAT32"; # meh, good enough } '' diff --git a/lib/image-builder/tests/filesystems/default.nix b/lib/image-builder/tests/filesystems/default.nix index 16085137..2b09e722 100644 --- a/lib/image-builder/tests/filesystems/default.nix +++ b/lib/image-builder/tests/filesystems/default.nix @@ -29,7 +29,7 @@ let ln -s ${fs}/${fs.filename} $out/ '') fileSystem; in - pkgs.runCommandNoCC "filesystems-test" {} '' + pkgs.runCommand "filesystems-test" {} '' mkdir -p $out/ ${concatStringsSep "\n" cmds} '' diff --git a/lib/image-builder/tests/filesystems/default_with_files.nix b/lib/image-builder/tests/filesystems/default_with_files.nix index a3e3c74d..dd0cfced 100644 --- a/lib/image-builder/tests/filesystems/default_with_files.nix +++ b/lib/image-builder/tests/filesystems/default_with_files.nix @@ -32,7 +32,7 @@ let ln -s ${fs}/${fs.filename} $out/ '') fileSystem; in - pkgs.runCommandNoCC "filesystems-test" {} '' + pkgs.runCommand "filesystems-test" {} '' mkdir -p $out/ ${concatStringsSep "\n" cmds} '' diff --git a/modules/cross-workarounds.nix b/modules/cross-workarounds.nix index 823ba6f6..280d3ccf 100644 --- a/modules/cross-workarounds.nix +++ b/modules/cross-workarounds.nix @@ -8,7 +8,7 @@ let config.nixpkgs.crossSystem != null && config.nixpkgs.localSystem.system != null && config.nixpkgs.crossSystem.system != config.nixpkgs.localSystem.system; - nullPackage = pkgs.runCommandNoCC "null" {} '' + nullPackage = pkgs.runCommand "null" {} '' mkdir -p $out ''; in diff --git a/modules/initrd-boot-gui.nix b/modules/initrd-boot-gui.nix index b11edeb0..d5cc232a 100644 --- a/modules/initrd-boot-gui.nix +++ b/modules/initrd-boot-gui.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: let - minimalX11Config = pkgs.runCommandNoCC "minimalX11Config" { + minimalX11Config = pkgs.runCommand "minimalX11Config" { allowedReferences = [ "out" ]; } '' (PS4=" $ "; set -x diff --git a/modules/initrd-kernel.nix b/modules/initrd-kernel.nix index fbe09244..3e8e5dd5 100644 --- a/modules/initrd-kernel.nix +++ b/modules/initrd-kernel.nix @@ -122,8 +122,8 @@ in object = let nullModules = pkgs.callPackage ( - { runCommandNoCC, ... }: - runCommandNoCC "null-modules" { } '' + { runCommand, ... }: + runCommand "null-modules" { } '' mkdir -p $out/lib/modules '' ) {}; @@ -145,7 +145,7 @@ in stdenv = pkgs.stdenv; # callPackage so that override / overrideAttrs exist. kernel = pkgs.callPackage ( - { runCommandNoCC, ... }: runCommandNoCC "null-kernel" { + { runCommand, ... }: runCommand "null-kernel" { passthru = rec { # minimum supported version~ish # The exact version doesn't matter much, as long as it diff --git a/modules/initrd.nix b/modules/initrd.nix index 6aa87250..a2648c24 100644 --- a/modules/initrd.nix +++ b/modules/initrd.nix @@ -6,7 +6,7 @@ let busybox makeInitrd mkExtraUtils - runCommandNoCC + runCommand writeText ; inherit (lib) @@ -115,7 +115,7 @@ let extraUdevRules = writeText "99-extra.rules" config.mobile.boot.stage-1.extraUdevRules; - udevRules = runCommandNoCC "udev-rules" { + udevRules = runCommand "udev-rules" { allowedReferences = [ extraUtils ]; preferLocalBuild = true; } '' @@ -165,7 +165,7 @@ let ] ++ optionals (stage-1 ? extraUtils) stage-1.extraUtils ++ [{ - package = runCommandNoCC "empty" {} "mkdir -p $out"; + package = runCommand "empty" {} "mkdir -p $out"; extraCommand = let inherit udev; @@ -207,7 +207,7 @@ let }; # ncdu -f result/initrd.ncdu - initrd-meta = pkgs.runCommandNoCC "initrd-${device_name}-meta" { + initrd-meta = pkgs.runCommand "initrd-${device_name}-meta" { nativeBuildInputs = with pkgs.buildPackages; [ ncdu cpio @@ -355,7 +355,7 @@ in boot.initrd.supportedFilesystems = lib.mkOverride 10 []; system.build.initialRamdiskSecretAppender = - pkgs.runCommandNoCC "noopRamdiskSecretAppender" {} "touch $out" + pkgs.runCommand "noopRamdiskSecretAppender" {} "touch $out" ; mobile.outputs = { @@ -370,7 +370,7 @@ in # default NixOS outputs. Do not refer to this in Mobile NixOS. system.build.initialRamdisk = if config.mobile.rootfs.shared.enabled - then pkgs.runCommandNoCC "nullInitialRamdisk" {} "touch $out" + then pkgs.runCommand "nullInitialRamdisk" {} "touch $out" else initrd ; diff --git a/modules/stage-0.nix b/modules/stage-0.nix index c4a293a3..bc3e12d7 100644 --- a/modules/stage-0.nix +++ b/modules/stage-0.nix @@ -9,7 +9,7 @@ let inherit (config.mobile.boot.stage-1) kernel; # A bit dirty, but actually works for what we want. - fdt-forward = pkgs.runCommandNoCC "fdt-forward-for-initrd" {} '' + fdt-forward = pkgs.runCommand "fdt-forward-for-initrd" {} '' mkdir -p $out/bin # /bin/sh is busybox in the initrd, assuredly. echo "#!/bin/sh" > $out/bin/fdt-forward diff --git a/modules/system-build.nix b/modules/system-build.nix index 660e2827..1f7c94cc 100644 --- a/modules/system-build.nix +++ b/modules/system-build.nix @@ -5,7 +5,7 @@ let deviceName = config.mobile.device.name; - dtbMapping = pkgs.runCommandNoCC "dtb-mapping.json" {} '' + dtbMapping = pkgs.runCommand "dtb-mapping.json" {} '' ( PS4=" $ "; set -x ${pkgs.buildPackages.mobile-nixos.map-dtbs}/bin/map-dtbs $(find ${config.hardware.deviceTree.package} -name '*.dtb' | sort) > $out diff --git a/modules/system-types/android/bootimg.nix b/modules/system-types/android/bootimg.nix index 2cac1a97..341a0940 100644 --- a/modules/system-types/android/bootimg.nix +++ b/modules/system-types/android/bootimg.nix @@ -13,7 +13,7 @@ let inherit (lib) optionalString; inherit (pkgs) buildPackages; in -pkgs.runCommandNoCC name { +pkgs.runCommand name { nativeBuildInputs = with buildPackages; [ mkbootimg dtbTool diff --git a/modules/system-types/android/default.nix b/modules/system-types/android/default.nix index 5340f105..eff06d39 100644 --- a/modules/system-types/android/default.nix +++ b/modules/system-types/android/default.nix @@ -30,7 +30,7 @@ let # either of fastboot or the outputs. # This is because this output should have no refs. A simple tarball of this # output should be usable even on systems without Nix. - android-fastboot-images = pkgs.runCommandNoCC "android-fastboot-images-${device.name}" {} '' + android-fastboot-images = pkgs.runCommand "android-fastboot-images-${device.name}" {} '' mkdir -p $out cp -v ${rootfs}/${rootfs.filename} $out/system.img cp -v ${android-bootimg} $out/boot.img diff --git a/modules/system-types/depthcharge/depthcharge-build.nix b/modules/system-types/depthcharge/depthcharge-build.nix index 90a45b1a..21729ff8 100644 --- a/modules/system-types/depthcharge/depthcharge-build.nix +++ b/modules/system-types/depthcharge/depthcharge-build.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, runCommandNoCC +, runCommand , initrd , system , imageBuilder @@ -55,7 +55,7 @@ let }; # The image file containing the kernel and initrd. - kpart = runCommandNoCC "kpart-${device_name}" { + kpart = runCommand "kpart-${device_name}" { nativeBuildInputs = [ dtc ubootTools @@ -114,7 +114,7 @@ in # Takes the built image, and do some light editing using `cgpt`. # This uses some depthcharge-specific fields to make the image bootable. # FIXME : integrate into the makeGPT call with postBuild or something - disk-image = runCommandNoCC "depthcharge-${device_name}" { nativeBuildInputs = [ vboot_reference ]; } '' + disk-image = runCommand "depthcharge-${device_name}" { nativeBuildInputs = [ vboot_reference ]; } '' # Copy the generated image... # Note that while it's GPT, it's lacking some depthcharge magic attributes cp ${image}/${name}.img ./ diff --git a/modules/system-types/u-boot/default.nix b/modules/system-types/u-boot/default.nix index b3e7c6c2..77e23658 100644 --- a/modules/system-types/u-boot/default.nix +++ b/modules/system-types/u-boot/default.nix @@ -4,7 +4,7 @@ let enabled = config.mobile.system.type == "u-boot"; inherit (config.mobile.outputs) recovery stage-0; - inherit (pkgs) buildPackages imageBuilder runCommandNoCC; + inherit (pkgs) buildPackages imageBuilder runCommand; inherit (lib) mkIf mkOption types; cfg = config.mobile.quirks.u-boot; inherit (cfg) soc; @@ -90,7 +90,7 @@ let booti ''${kernel_addr_r} ''${ramdisk_addr_r}:''${ramdisk_size} ''${fdt_addr_r}; ''; - bootscr = runCommandNoCC "${deviceName}-boot.scr" { + bootscr = runCommand "${deviceName}-boot.scr" { nativeBuildInputs = [ buildPackages.ubootTools ]; diff --git a/modules/system-types/uefi/default.nix b/modules/system-types/uefi/default.nix index c830bff1..78b8ea8c 100644 --- a/modules/system-types/uefi/default.nix +++ b/modules/system-types/uefi/default.nix @@ -5,7 +5,7 @@ let inherit (lib) mkEnableOption mkIf mkOption types; inherit (pkgs.stdenv) hostPlatform; - inherit (pkgs) imageBuilder runCommandNoCC; + inherit (pkgs) imageBuilder runCommand; inherit (config.mobile.outputs) recovery stage-0; cfg = config.mobile.quirks.uefi; deviceName = config.mobile.device.name; @@ -22,7 +22,7 @@ let kernelParamsFile = pkgs.writeText "${deviceName}-boot.cmd" config.boot.kernelParams; - efiKernel = pkgs.runCommandNoCC "${deviceName}-efiKernel" { + efiKernel = pkgs.runCommand "${deviceName}-efiKernel" { nativeBuildInputs = [ pkgs.stdenv.cc.bintools.bintools_bin ]; diff --git a/overlay/mobile-nixos/android-flashable-zip/make-flashable-zip.nix b/overlay/mobile-nixos/android-flashable-zip/make-flashable-zip.nix index ea5bbeef..14eede48 100644 --- a/overlay/mobile-nixos/android-flashable-zip/make-flashable-zip.nix +++ b/overlay/mobile-nixos/android-flashable-zip/make-flashable-zip.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC, writeText, zip, mobile-nixos }: +{ runCommand, writeText, zip, mobile-nixos }: let inherit (mobile-nixos) android-flashable-zip-binaries; @@ -9,7 +9,7 @@ in let update-script = writeText "update-script.rb" script; in -runCommandNoCC name { +runCommand name { nativeBuildInputs = [ zip ]; diff --git a/overlay/mobile-nixos/cross-canary/test.nix b/overlay/mobile-nixos/cross-canary/test.nix index 9aa11f2c..e535cd32 100644 --- a/overlay/mobile-nixos/cross-canary/test.nix +++ b/overlay/mobile-nixos/cross-canary/test.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommandNoCC, runtimeShell, busybox, hello, hello-mruby, pkgsBuildBuild, mruby, mrbgems, mobile-nixos }: +{ stdenv, lib, runCommand, runtimeShell, busybox, hello, hello-mruby, pkgsBuildBuild, mruby, mrbgems, mobile-nixos }: let static = stdenv.hostPlatform.isStatic; @@ -15,7 +15,7 @@ let if stdenv.buildPlatform == stdenv.hostPlatform then "" else "${pkgsBuildBuild.qemu}/bin/${emulators.${system}}" ; - mkTest = what: script: runCommandNoCC "cross-canary-${what}-${stdenv.system}" {} '' + mkTest = what: script: runCommand "cross-canary-${what}-${stdenv.system}" {} '' assert_static() { if ! ${file}/bin/file "$1" | grep -q 'statically linked'; then printf "Assertion failed: '%s' is not a static binary\n" "$1" diff --git a/overlay/mobile-nixos/fdt-forward/default.nix b/overlay/mobile-nixos/fdt-forward/default.nix index 3d9785b5..fd70a5b1 100644 --- a/overlay/mobile-nixos/fdt-forward/default.nix +++ b/overlay/mobile-nixos/fdt-forward/default.nix @@ -1,6 +1,6 @@ -{ runCommandNoCC, runtimeShell, lib, dtc, ubootTools }: +{ runCommand, runtimeShell, lib, dtc, ubootTools }: -runCommandNoCC "fdt-forward" {} '' +runCommand "fdt-forward" {} '' mkdir -p $out/bin echo "#!${runtimeShell}" > $out/bin/fdt-forward cat "${./fdt-forward.sh}" >> $out/bin/fdt-forward diff --git a/overlay/mobile-nixos/gui-assets/default.nix b/overlay/mobile-nixos/gui-assets/default.nix index 1c2458b7..662a4f79 100644 --- a/overlay/mobile-nixos/gui-assets/default.nix +++ b/overlay/mobile-nixos/gui-assets/default.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC +{ runCommand , overpass , roboto , font-awesome_4 @@ -8,7 +8,7 @@ let artwork = ../../../artwork; in -runCommandNoCC "gui-assets" { +runCommand "gui-assets" { nativeBuildInputs = [ nodePackages.svgo ]; diff --git a/overlay/mobile-nixos/lvgui/default.nix b/overlay/mobile-nixos/lvgui/default.nix index c5b19226..48daf9ce 100644 --- a/overlay/mobile-nixos/lvgui/default.nix +++ b/overlay/mobile-nixos/lvgui/default.nix @@ -1,4 +1,4 @@ -{ runCommandNoCC +{ runCommand , lib , mruby , mobile-nixos @@ -38,7 +38,7 @@ let "xdg.rb" ]); - app = runCommandNoCC name { + app = runCommand name { inherit src; nativeBuildInputs = [ mruby diff --git a/overlay/mobile-nixos/map-dtbs/default.nix b/overlay/mobile-nixos/map-dtbs/default.nix index ffdb6422..eb0084c2 100644 --- a/overlay/mobile-nixos/map-dtbs/default.nix +++ b/overlay/mobile-nixos/map-dtbs/default.nix @@ -1,6 +1,6 @@ -{ runCommandNoCC, runtimeShell, lib, dtc }: +{ runCommand, runtimeShell, lib, dtc }: -runCommandNoCC "map-dtbs" {} '' +runCommand "map-dtbs" {} '' mkdir -p $out/bin echo "#!${runtimeShell}" > $out/bin/map-dtbs cat "${./map-dtbs.sh}" >> $out/bin/map-dtbs