ocaml-javalib, ocaml-sawja: uses patchShebangs rather than ad-hoc patches

2014-09-03 21:59:29 +02:00
parent 624e98e78e
commit ebbd54e9f0
4 changed files with 4 additions and 12 deletions
--- a/pkgs/development/ocaml-modules/javalib/configure.sh.patch
+++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch
@@ -1,11 +1,5 @@
 --- javalib-2.3-orig/configure.sh	2013-10-30 08:35:30.000000000 +0100
 +++ javalib-2.3/configure.sh	2014-07-06 17:28:39.025066199 +0200
-@@ -1,4 +1,4 @@
-#!/bin/bash
-+#!/bin/sh
-
- ###
- ### A configuration script for Javalib
@@ -44,7 +44,7 @@
 DESTDIR=
 # The ocamlpath variable for the compiler to locate the locally-installed
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {

  createFindlibDestdir = true;

+  preConfigure = "patchShebangs ./configure.sh";
+
  configureScript = "./configure.sh";
  dontAddPrefix = "true";