diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
| commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
| tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/development/misc | |
| parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
| parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
| download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip | |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/development/misc')
| -rw-r--r-- | nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/misc/stm32/inav/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix index fbe48803f2db..e66bb6fe2118 100644 --- a/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix +++ b/nixpkgs/pkgs/development/misc/stm32/betaflight/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { sed -ri "s/REVISION.*=.*git log.*/REVISION = ${builtins.substring 0 10 src.rev}/" Makefile # Simulate abbrev'd rev. sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex - substitutateInPlace Makefile \ + substituteInPlace Makefile \ --replace "--specs=nano.specs" "" ''; diff --git a/nixpkgs/pkgs/development/misc/stm32/inav/default.nix b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix index 102b1eb8048d..683883ddbce9 100644 --- a/nixpkgs/pkgs/development/misc/stm32/inav/default.nix +++ b/nixpkgs/pkgs/development/misc/stm32/inav/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { sed -ri "s/-j *[0-9]+//" Makefile # Eliminate parallel build args in submakes sed -ri "s/binary hex/hex/" Makefile # No need for anything besides .hex - substitutateInPlace Makefile \ + substituteInPlace Makefile \ --replace "--specs=nano.specs" "" ''; |