Unverified Commit 863e039d authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #335476 from linj-fork/pr/fix-p4-16-mode 

emacsPackages.p4-16-mode: fix build
parents 14c37f1b 8f295e4d

pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix

+17 −1
Original line number Diff line number Diff line
@@ -35,7 +35,23 @@ let 


      super = imported;



      overrides = { };

      overrides = {

        p4-16-mode = super.p4-16-mode.overrideAttrs {

          # workaround https://github.com/NixOS/nixpkgs/issues/301795

          prePatch = ''

            mkdir tmp-untar-dir

            pushd tmp-untar-dir



            tar --extract --verbose --file=$src

            content_directory=$(echo p4-16-mode-*)

            cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el

            src=$PWD/$content_directory.tar

            tar --create --verbose --file=$src $content_directory



            popd

          '';

        };

      };



    in

    super // overrides

pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix

+15 −0
Original line number Diff line number Diff line
@@ -30,6 +30,21 @@ self: let 
    super = imported;



    overrides = {

      p4-16-mode = super.p4-16-mode.overrideAttrs {

        # workaround https://github.com/NixOS/nixpkgs/issues/301795

        prePatch = ''

          mkdir tmp-untar-dir

          pushd tmp-untar-dir



          tar --extract --verbose --file=$src

          content_directory=$(echo p4-16-mode-*)

          cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el

          src=$PWD/$content_directory.tar

          tar --create --verbose --file=$src $content_directory



          popd

        '';

      };

    };



  in super // overrides);