nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

naja: 0.2.1 -> 0.2.2 (#430692)

authored by

Cosima Neidahl and committed by
GitHub
7306c79f 01ae052d

+26 -17
+26 -17
pkgs/by-name/na/naja/package.nix
··· 10 10 flex, 11 11 pkg-config, 12 12 python3, 13 + sphinx, 13 14 tbb_2021, 14 15 buildPackages, 15 16 nix-update-script, 16 17 }: 17 18 stdenv.mkDerivation (finalAttrs: { 18 19 pname = "naja"; 19 - version = "0.2.1"; 20 + version = "0.2.2"; 20 21 21 22 src = fetchFromGitHub { 22 23 owner = "najaeda"; 23 24 repo = "naja"; 24 25 tag = "v${finalAttrs.version}"; 25 - hash = "sha256-eKeb6V9u4huesQV4sq9GxIcxO2SVvMrUDeQaObCCags="; 26 + hash = "sha256-cm9MwN60R/K2bL4FWpvusFmb2ENYEYg8NcMVgmeTj0c="; 26 27 fetchSubmodules = true; 27 28 }; 28 29 ··· 33 32 "dev" 34 33 ]; 35 34 35 + postPatch = '' 36 + # This is a find module, not a config module, so this doesn't make it get automatically picked up by CMake hooks, 37 + # but it's better than dumping it at $out/cmake, and this makes it get moved to dev output 38 + substituteInPlace cmake/CMakeLists.txt \ 39 + --replace-fail 'DESTINATION cmake' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/cmake' 40 + 41 + # Fix install location for bne library & headers 42 + # Remove when https://github.com/najaeda/naja/pull/278 merged & in release 43 + substituteInPlace src/bne/CMakeLists.txt \ 44 + --replace-fail 'LIBRARY DESTINATION lib' 'LIBRARY DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ 45 + --replace-fail 'PUBLIC_HEADER DESTINATION include' 'PUBLIC_HEADER DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}' 46 + '' 36 47 # disable building tests for cross build 37 - postPatch = 38 - lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 39 - substituteInPlace CMakeLists.txt \ 40 - --replace-fail 'enable_testing()' "" \ 41 - --replace-fail 'add_subdirectory(test)' "" 42 - substituteInPlace thirdparty/yosys-liberty/CMakeLists.txt \ 43 - --replace-fail 'add_subdirectory(test)' "" 44 - '' 45 - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 46 - patchShebangs --build test/test_utils/diff_files.py 47 - ''; 48 + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 49 + substituteInPlace CMakeLists.txt \ 50 + --replace-fail 'enable_testing()' "" \ 51 + --replace-fail 'add_subdirectory(test)' "" 52 + substituteInPlace thirdparty/yosys-liberty/CMakeLists.txt \ 53 + --replace-fail 'add_subdirectory(test)' "" 54 + '' 55 + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 56 + patchShebangs --build test/test_utils/diff_files.py 57 + ''; 48 58 49 59 strictDeps = true; 50 60 ··· 65 53 doxygen 66 54 flex 67 55 pkg-config 56 + sphinx 68 57 ] 69 58 ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ 70 59 python3 # test scripts ··· 86 73 (lib.cmakeFeature "CAPNP_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnp")) 87 74 (lib.cmakeFeature "CAPNPC_CXX_EXECUTABLE" (lib.getExe' buildPackages.capnproto "capnpc-c++")) 88 75 ]; 89 - 90 - postInstall = '' 91 - moveToOutput lib/libnaja_bne.so $lib 92 - ''; 93 76 94 77 doCheck = true; 95 78