src/util/flashrom: move from src/flashrom

2 years ago · c40ed36e6b
parent 709bb2104d
commit c40ed36e6b
4 changed files with 2 additions and 2 deletions
--- 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 { };
 }


--- a/src/util/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
--- a/src/util/flashrom/0002-layout.c-allow-nested-regions.patch
+++ b/src/util/flashrom/0002-layout.c-allow-nested-regions.patch
--- a/src/util/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 [