fixup "git-export" directory names

All tested to build.
For freetalk the hash change seems unrelated to fetchgit changes.

FIXME: it might be suitable to adapt nix-prefetch-git.
This commit is contained in:
Vladimír Čunát
2015-01-13 17:44:24 +01:00
parent 664d0fbbba
commit 3dfd87d7af
6 changed files with 9 additions and 14 deletions

View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
inherit rev;
};
sourceRoot = "git-export/src";
preConfigure = "cd src";
makeFlags =
[ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.

View File

@@ -12,11 +12,8 @@ stdenv.mkDerivation rec {
buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ];
setSourceRoot = ''
sourceRoot=git-export/ldapvi
'';
preConfigure = ''
cd ldapvi
./autogen.sh
'';

View File

@@ -9,7 +9,6 @@ stdenv.mkDerivation {
url = "http://github.com/brianb/mdbtools.git";
rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd";
sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59";
name = "mdbtools-git-export";
};
buildInputs = [

View File

@@ -33,10 +33,10 @@ let
postPatch = ''
export wineDir=$(pwd)
patchShebangs $wineDir/tools/
chmod u+w $wineDir/../git-export/debian/tools/
patchShebangs $wineDir/../git-export/debian/tools/
chmod -R +rwx ../git-export/
make -C ../git-export/patches DESTDIR=$wineDir install
chmod u+w $wineDir/../${wine_patches.name}/debian/tools/
patchShebangs $wineDir/../${wine_patches.name}/debian/tools/
chmod -R +rwx ../${wine_patches.name}/
make -C ../${wine_patches.name}/patches DESTDIR=$wineDir install
'';
});