diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-03 21:59:29 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2014-09-03 21:59:29 +0200 |
commit | ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a (patch) | |
tree | 008b6adaf34c2938e59d199f6e02fd32d96e1b42 /pkgs/development/ocaml-modules/javalib | |
parent | 624e98e78e011014ba204ed414314836f15a1415 (diff) | |
download | nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.tar nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.tar.gz nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.tar.bz2 nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.tar.lz nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.tar.xz nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.tar.zst nixlib-ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a.zip |
ocaml-javalib, ocaml-sawja: uses patchShebangs rather than ad-hoc patches
Diffstat (limited to 'pkgs/development/ocaml-modules/javalib')
-rw-r--r-- | pkgs/development/ocaml-modules/javalib/configure.sh.patch | 6 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/javalib/default.nix | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch index 77a2a5ba4ae5..67e019b277af 100644 --- 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 diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 2fa72dcf07f1..365fcc677cc9 100644 --- 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"; |