From c40ed36e6bf47094cc41efa85fc47e5788042522 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 2 Jan 2023 11:36:09 -0800 Subject: [PATCH] src/util/flashrom: move from src/flashrom --- src/default.nix | 2 +- ...1-implement-wp-enable-disable-for-gigadevice-flash-chi.patch | 0 .../flashrom/0002-layout.c-allow-nested-regions.patch | 0 src/{ => util}/flashrom/default.nix | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/{ => util}/flashrom/0001-implement-wp-enable-disable-for-gigadevice-flash-chi.patch (100%) rename src/{ => util}/flashrom/0002-layout.c-allow-nested-regions.patch (100%) rename src/{ => util}/flashrom/default.nix (96%) diff --git a/src/default.nix b/src/default.nix index 4a3fe94..7beb81b 100644 --- a/src/default.nix +++ b/src/default.nix @@ -31,7 +31,7 @@ in { kgpe = ownerboot (import ./platform/kgpe { inherit lib; }); em100 = nixpkgsOnBuildForBuild.callPackage ./util/em100 { }; - flashrom = nixpkgsOnBuildForBuild.callPackage ./flashrom { }; + flashrom = nixpkgsOnBuildForBuild.callPackage ./util/flashrom { }; } diff --git a/src/flashrom/0001-implement-wp-enable-disable-for-gigadevice-flash-chi.patch b/src/util/flashrom/0001-implement-wp-enable-disable-for-gigadevice-flash-chi.patch similarity index 100% rename from src/flashrom/0001-implement-wp-enable-disable-for-gigadevice-flash-chi.patch rename to src/util/flashrom/0001-implement-wp-enable-disable-for-gigadevice-flash-chi.patch diff --git a/src/flashrom/0002-layout.c-allow-nested-regions.patch b/src/util/flashrom/0002-layout.c-allow-nested-regions.patch similarity index 100% rename from src/flashrom/0002-layout.c-allow-nested-regions.patch rename to src/util/flashrom/0002-layout.c-allow-nested-regions.patch diff --git a/src/flashrom/default.nix b/src/util/flashrom/default.nix similarity index 96% rename from src/flashrom/default.nix rename to src/util/flashrom/default.nix index 04b3aa4..9909593 100644 --- a/src/flashrom/default.nix +++ b/src/util/flashrom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { ./0001-implement-wp-enable-disable-for-gigadevice-flash-chi.patch ./0002-layout.c-allow-nested-regions.patch ] else [ - ../platform/kevin/chromebook-flashrom-kludges.patch + ../../platform/kevin/chromebook-flashrom-kludges.patch ]; makeFlags = if !forChromebook then [