From 624e98e78e011014ba204ed414314836f15a1415 Mon Sep 17 00:00:00 2001 From: vbgl Date: Mon, 1 Sep 2014 11:59:16 +0200 Subject: [PATCH 1/2] ocaml-javalib, ocaml-sawja: removes wrong path to bash in configure scripts --- pkgs/development/ocaml-modules/javalib/configure.sh.patch | 6 ++++++ pkgs/development/ocaml-modules/sawja/configure.sh.patch | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch index 67e019b277af..77a2a5ba4ae5 100644 --- a/pkgs/development/ocaml-modules/javalib/configure.sh.patch +++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch @@ -1,5 +1,11 @@ --- 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/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch index 8165de242f57..e01df32bbded 100644 --- a/pkgs/development/ocaml-modules/sawja/configure.sh.patch +++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch @@ -1,5 +1,11 @@ --- sawja-1.5-orig/configure.sh 2013-10-30 08:35:29.000000000 +0100 +++ sawja-1.5/configure.sh 2014-07-05 18:50:26.833798254 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + ### + ### A configuration script for Sawja @@ -39,7 +39,7 @@ DESTDIR= # The ocamlpath variable for the compiler to locate the locally-installed From ebbd54e9f0aa8d77ba0f72eac0b032dd4fd4f60a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 3 Sep 2014 21:59:29 +0200 Subject: [PATCH 2/2] ocaml-javalib, ocaml-sawja: uses patchShebangs rather than ad-hoc patches --- pkgs/development/ocaml-modules/javalib/configure.sh.patch | 6 ------ pkgs/development/ocaml-modules/javalib/default.nix | 2 ++ pkgs/development/ocaml-modules/sawja/configure.sh.patch | 6 ------ pkgs/development/ocaml-modules/sawja/default.nix | 2 ++ 4 files changed, 4 insertions(+), 12 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"; diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch index e01df32bbded..8165de242f57 100644 --- a/pkgs/development/ocaml-modules/sawja/configure.sh.patch +++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch @@ -1,11 +1,5 @@ --- sawja-1.5-orig/configure.sh 2013-10-30 08:35:29.000000000 +0100 +++ sawja-1.5/configure.sh 2014-07-05 18:50:26.833798254 +0200 -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - ### - ### A configuration script for Sawja @@ -39,7 +39,7 @@ DESTDIR= # The ocamlpath variable for the compiler to locate the locally-installed diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index bed87a50f81d..ef3ab9a46b93 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + preConfigure = "patchShebangs ./configure.sh"; + configureScript = "./configure.sh"; dontAddPrefix = "true";