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:
parent
664d0fbbba
commit
3dfd87d7af
|
@ -11,7 +11,7 @@ let
|
|||
name="${baseName}-${version}";
|
||||
url="https://github.com/GNUFreetalk/freetalk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz";
|
||||
sha256="0vh6snkd66gdzimdiyy9idhsip60d5xc7qh4w48k7n8h93ydrb2b";
|
||||
};
|
||||
buildInputs = [
|
||||
guile pkgconfig glib loudmouth gmp libidn readline libtool
|
||||
|
@ -24,7 +24,6 @@ stdenv.mkDerivation {
|
|||
inherit buildInputs;
|
||||
src = fetchgit {
|
||||
inherit (s) url rev sha256;
|
||||
name = "git-export-${s.name}";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
src = "${srcs.df_unfuck} ${srcs.df}";
|
||||
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase";
|
||||
|
||||
sourceRoot = "git-export";
|
||||
sourceRoot = srcs.df_unfuck.name;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
||||
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig
|
||||
# Fix rpath
|
||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
|
||||
cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
|
||||
cp -f ./${srcs.df_unfuck.name}/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
|
||||
|
||||
cp $permission $out/share/df_linux/nix_permission
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ stdenv.mkDerivation {
|
|||
url = "http://github.com/brianb/mdbtools.git";
|
||||
rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd";
|
||||
sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59";
|
||||
name = "mdbtools-git-export";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue