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: 0df87918e586
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26d65faa626d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 8, 2018

  1. mono-addins: fix build (#46354) 

    (cherry picked from commit 2031c0e)
    @worldofpeace @xeji
    worldofpeace authored and xeji committed Sep 8, 2018
    Copy the full SHA
    26d65fa View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 pkgs/development/libraries/mono-addins/default.nix
6 changes: 4 additions & 2 deletions pkgs/development/libraries/mono-addins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }:

stdenv.mkDerivation rec {
name = "mono-addins-${version}";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ mono gtk-sharp-2_0 ];

# Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged
buildInputs = [ mono48 gtk-sharp-2_0 ];

dontStrip = true;