lol

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.

+9 -14
+1 -2
pkgs/applications/networking/instant-messengers/freetalk/default.nix
··· 11 11 name="${baseName}-${version}"; 12 12 url="https://github.com/GNUFreetalk/freetalk"; 13 13 rev = "refs/tags/v${version}"; 14 - sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz"; 14 + sha256="0vh6snkd66gdzimdiyy9idhsip60d5xc7qh4w48k7n8h93ydrb2b"; 15 15 }; 16 16 buildInputs = [ 17 17 guile pkgconfig glib loudmouth gmp libidn readline libtool ··· 24 24 inherit buildInputs; 25 25 src = fetchgit { 26 26 inherit (s) url rev sha256; 27 - name = "git-export-${s.name}"; 28 27 }; 29 28 30 29 preConfigure = ''
+2 -2
pkgs/games/dwarf-fortress/default.nix
··· 31 31 src = "${srcs.df_unfuck} ${srcs.df}"; 32 32 phases = "unpackPhase patchPhase configurePhase buildPhase installPhase"; 33 33 34 - sourceRoot = "git-export"; 34 + sourceRoot = srcs.df_unfuck.name; 35 35 36 36 cmakeFlags = [ 37 37 "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" ··· 52 52 echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig 53 53 # Fix rpath 54 54 patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress 55 - cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so 55 + cp -f ./${srcs.df_unfuck.name}/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so 56 56 57 57 cp $permission $out/share/df_linux/nix_permission 58 58
+1 -1
pkgs/tools/misc/ipxe/default.nix
··· 16 16 inherit rev; 17 17 }; 18 18 19 - sourceRoot = "git-export/src"; 19 + preConfigure = "cd src"; 20 20 21 21 makeFlags = 22 22 [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
+1 -4
pkgs/tools/misc/ldapvi/default.nix
··· 12 12 13 13 buildInputs = [ openldap openssl popt glib ncurses readline pkgconfig cyrus_sasl autoconf automake ]; 14 14 15 - setSourceRoot = '' 16 - sourceRoot=git-export/ldapvi 17 - ''; 18 - 19 15 preConfigure = '' 16 + cd ldapvi 20 17 ./autogen.sh 21 18 ''; 22 19
-1
pkgs/tools/misc/mdbtools/git.nix
··· 9 9 url = "http://github.com/brianb/mdbtools.git"; 10 10 rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd"; 11 11 sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59"; 12 - name = "mdbtools-git-export"; 13 12 }; 14 13 15 14 buildInputs = [
+4 -4
pkgs/tools/misc/pipelight/default.nix
··· 33 33 postPatch = '' 34 34 export wineDir=$(pwd) 35 35 patchShebangs $wineDir/tools/ 36 - chmod u+w $wineDir/../git-export/debian/tools/ 37 - patchShebangs $wineDir/../git-export/debian/tools/ 38 - chmod -R +rwx ../git-export/ 39 - make -C ../git-export/patches DESTDIR=$wineDir install 36 + chmod u+w $wineDir/../${wine_patches.name}/debian/tools/ 37 + patchShebangs $wineDir/../${wine_patches.name}/debian/tools/ 38 + chmod -R +rwx ../${wine_patches.name}/ 39 + make -C ../${wine_patches.name}/patches DESTDIR=$wineDir install 40 40 ''; 41 41 }); 42 42