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

Commits on Mar 12, 2018

  1. xarchiver: fix darwion build 

    /cc ZHF #36454

(cherry picked from commit c5d531d)
    @LnL7
    LnL7 committed Mar 12, 2018
    Copy the full SHA
    545665b View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/tools/archivers/xarchiver/default.nix
10 changes: 9 additions & 1 deletion pkgs/tools/archivers/xarchiver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:
{ stdenv, fetchFromGitHub, fetchpatch, gtk3, pkgconfig, intltool, libxslt, hicolor-icon-theme }:

stdenv.mkDerivation rec {
version = "0.5.4.12";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
sha256 = "13d8slcx3frz0dhl1w4llj7001n57cjjb8r7dlaw5qacaas3xfwi";
};

patches = [
# Fixes darwin build, remove with next update.
(fetchpatch {
url = https://github.com/ib/xarchiver/commit/8c69d066a827419feafd0bd047d19207ceadc7df.patch;
sha256 = "1ch1409hx1ynkm0mz93zy8h7wvcrsn56sz7lczsf6hznc8yzl0qg";
})
];

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool libxslt hicolor-icon-theme ];