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

Commits on Nov 29, 2018

  1. fix reiserfsprogs cross compilation

    @eburimu @Mic92
    eburimu authored and Mic92 committed Nov 29, 2018
    Copy the full SHA
    cfb184f View commit details
Showing with 13 additions and 1 deletion.
  1. +3 −1 pkgs/tools/filesystems/reiserfsprogs/default.nix
  2. +10 −0 pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
4 changes: 3 additions & 1 deletion pkgs/tools/filesystems/reiserfsprogs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libuuid }:
{ stdenv, fetchurl, libuuid, autoreconfHook }:

let version = "3.6.24"; in
stdenv.mkDerivation rec {
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
};

patches = [ ./reiserfsprogs-ar-fix.patch ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libuuid ];

NIX_CFLAGS_COMPILE = "-std=gnu90";
10 changes: 10 additions & 0 deletions pkgs/tools/filesystems/reiserfsprogs/reiserfsprogs-ar-fix.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- reiserfsprogs-3.6.24/configure.ac.orig 2018-11-29 17:16:52.313624894 +0300
+++ reiserfsprogs-3.6.24/configure.ac 2018-11-29 17:16:54.480669132 +0300
@@ -21,6 +21,7 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
+AM_PROG_AR

dnl Checks for libraries.