Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a001d45ac265
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: efa604c139ae
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2021

  1. megatools: use wrapGAppsNoGuiHook

    The gui packages pulled in by wrapGAppsHook aren't needed as it's a cli tool.
    zowoq committed Jan 3, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    jbedo Justin Bedő
    Copy the full SHA
    2445030 View commit details
  2. Merge pull request #108293 from zowoq/docs-test

    megatools: use wrapGAppsNoGuiHook
    AndersonTorres authored Jan 3, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    efa604c View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/tools/networking/megatools/default.nix
4 changes: 2 additions & 2 deletions pkgs/tools/networking/megatools/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking
, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }:
, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsNoGuiHook }:

stdenv.mkDerivation rec {
pname = "megatools";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [
autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2
autoreconfHook pkg-config wrapGAppsNoGuiHook asciidoc libxml2
docbook_xsl docbook_xml_dtd_45 libxslt
];
buildInputs = [ glib glib-networking curl ]