gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchman: reorder attributes

Browse Source 
(cherry picked from commit 033896e98c)
(cherry picked from commit 33a43b4f4d63b99b87e6dfe3972f3e6e37bdd802)
This commit is contained in:
Emily
2024-11-30 15:11:35 +01:00
committed by Vladimír Čunát
parent d55bdcafd3
commit dcfeafd6a0
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/wa/watchman/package.nix
+13 -13
View File
@@ -42,11 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-cD8mIYCc+8Z2p3rwKVRFcW9sOBbpb5KHU5VpbXHMpeg=";
};
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs
"-DWATCHMAN_STATE_DIR=${stateDir}"
"-DWATCHMAN_VERSION_OVERRIDE=${finalAttrs.version}"
patches = [
# fix build with rustc >=1.79
(fetchpatch {
url = "https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883.patch";
hash = "sha256-lpGr5H28gfVXkWNdfDo4SCbF/p5jB4SNlHj6km/rfw4=";
})
];
nativeBuildInputs = [
@@ -83,20 +84,19 @@ stdenv.mkDerivation (finalAttrs: {
(darwinMinVersionHook "11.0")
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DENABLE_EDEN_SUPPORT=NO" # requires sapling (formerly known as eden), which is not packaged in nixpkgs
"-DWATCHMAN_STATE_DIR=${stateDir}"
"-DWATCHMAN_VERSION_OVERRIDE=${finalAttrs.version}"
];
cargoRoot = "watchman/cli";
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
patches = [
# fix build with rustc >=1.79
(fetchpatch {
url = "https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883.patch";
hash = "sha256-lpGr5H28gfVXkWNdfDo4SCbF/p5jB4SNlHj6km/rfw4=";
})
];
postPatch = ''
patchShebangs .
cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock