chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging-18.09' into release-18.09

Browse Source
This commit is contained in:
Vladimír Čunát
2018-10-04 08:45:49 +02:00
parent 6cbd1ec4b0 46069d481c
commit 11ec1cd1a6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/rust/default.nix
View File

@@ -93,8 +93,10 @@ in stdenv.mkDerivation (args // {
installPhase = args.installPhase or ''
runHook preInstall
mkdir -p $out/bin
find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \;
mkdir -p $out/bin $out/lib
find target/release -maxdepth 1 -type f -executable ! \( -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
find target/release -maxdepth 1 -regex ".*.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
rmdir --ignore-fail-on-non-empty $out/lib $out/bin
runHook postInstall
'';

4
pkgs/tools/compression/lz4/default.nix
View File

@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "lz4-${version}";
version = "1.8.2";
version = "1.8.3";
src = fetchFromGitHub {
sha256 = "0xbjbjrvgzypk8dnldakir06gb8m946d064lxx0qc4ky6m8n9hn2";
sha256 = "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g";
rev = "v${version}";
repo = "lz4";
owner = "lz4";