diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 17:46:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-01-13 17:46:44 +0100 |
| commit | 7637e71cee2b11d340c5ce99d777f6783a6b9885 (patch) | |
| tree | 14c7105faaef7c573105998f1bcb08afd403a5c0 /pkgs/tools | |
| parent | 995c9db5e6af69f44d87b8a28537f78dfd3f1582 (diff) | |
| parent | 3dfd87d7afc2d82f6b0ce7b8d7a61ffaa47526a0 (diff) | |
| download | nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.gz nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.bz2 nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.lz nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.xz nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.tar.zst nixlib-7637e71cee2b11d340c5ce99d777f6783a6b9885.zip | |
merge #5521: give fetchgit outputs nicer names
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/ipxe/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/ldapvi/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/misc/pipelight/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/system/proot/default.nix | 2 |
5 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 1f1302698c19..345e36fed711 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -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. diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 6dba834e8be5..df29341d58b4 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -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 ''; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 11b5520c7bb2..9262c6e8eb85 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation { url = "http://github.com/brianb/mdbtools.git"; rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd"; sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59"; - name = "mdbtools-git-export"; }; buildInputs = [ diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index dcc4e3ac42cb..7527ca6c1412 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -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 ''; }); diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 3eaa85e41eaa..172da395374d 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { substituteInPlace GNUmakefile --replace "/usr/local" "$out" ''; - sourceRoot = "git-export/src"; + sourceRoot = "proot/src"; meta = with stdenv.lib; { homepage = http://proot.me; |