Unverified Commit 8a462fb9 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

omnom: fix & refactor (#421398)

parents ec49bcde db462ff6

pkgs/by-name/om/omnom/package.nix

+41 −42
Original line number Diff line number Diff line
@@ -34,14 +34,25 @@ buildGoModule (finalAttrs: { 
    "-w"

  ];



  postBuild =

    let

      omnom-addons = buildNpmPackage {

  postInstall = ''

    mkdir -p $out/share/addons



    # Copy Firefox and Chrome addons

    cp -r ${finalAttrs.passthru.omnom-addons}/*.zip $out/share/addons



    mkdir -p $out/share/examples



    cp -r static templates $out/share

    cp config.yml_sample $out/share/examples/config.yml

  '';



  passthru = {

    omnom-addons = buildNpmPackage (finalAttrs': {

      pname = "omnom-addons";

      inherit (finalAttrs) version src;



      npmDepsHash = "sha256-sUn5IvcHWJ/yaqeGz9SGvGx9HHAlrcnS0lJxIxUVS6M=";

        sourceRoot = "${finalAttrs.src.name}/ext";

      sourceRoot = "${finalAttrs'.src.name}/ext";

      npmPackFlags = [ "--ignore-scripts" ];



      nativeBuildInputs = [ zip ];
@@ -59,6 +70,7 @@ buildGoModule (finalAttrs: { 


        pushd build

          zip "$out/omnom_ext_chrome.zip" ./* icons/* -x manifest_ff.json

          cp manifest_ff.json manifest.json

          zip "$out/omnom_ext_firefox.zip" ./* icons/* -x manifest_ff.json

        popd

      '';
@@ -66,23 +78,10 @@ buildGoModule (finalAttrs: { 
      postCheck = ''

        npm run build-test

      '';

      };

    in

    ''

      mkdir -p $out/share/addons



      # Copy Firefox and Chrome addons

      cp -r ${omnom-addons}/*.zip $out/share/addons

    '';



  postInstall = ''

    mkdir -p $out/share/examples



    cp -r static templates $out/share

    cp config.yml_sample $out/share/examples/config.yml

  '';

    });



  passthru.tests = nixosTests.omnom;

    tests = nixosTests.omnom;

  };



  meta = {

    description = "Webpage bookmarking and snapshotting service";