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: 98912d26050d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1bbb04e954d6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 12, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    a84607a View commit details
  2. Merge pull request #73297 from veprbl/pr/eagle_fix

    eagle: use mkDerivation provided by qt5
    worldofpeace authored Nov 12, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1bbb04e View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/science/electronics/eagle/eagle.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/electronics/eagle/eagle.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeDesktopItem
{ stdenv, mkDerivation, fetchurl, makeDesktopItem
, libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb
, libGL, glib, nss, nspr, expat, alsaLib
, qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine
@@ -11,7 +11,7 @@ let
qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
];
in
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "eagle";
version = "9.5.0";