Unverified Commit 594053bf authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #217632 from dotlambda/corrosion-0.3.3 

corrosion: 0.3.0 -> 0.3.3
parents ad539c9f 80c641d7

pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
diff --git a/cmake/CorrosionConfig.cmake.in b/cmake/CorrosionConfig.cmake.in

index c042a00..491f53c 100644

--- a/cmake/CorrosionConfig.cmake.in

+++ b/cmake/CorrosionConfig.cmake.in

@@ -4,11 +4,11 @@ if (Corrosion_FOUND)

     return()

 endif()

 

-list(APPEND CMAKE_MODULE_PATH "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_DATADIR@/cmake")

+list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_FULL_DATADIR@/cmake")

 

 add_executable(Corrosion::Generator IMPORTED GLOBAL)

 set_property(

     TARGET Corrosion::Generator

-    PROPERTY IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_LIBEXECDIR@/corrosion-generator")

+    PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_LIBEXECDIR@/corrosion-generator")

 

 include(Corrosion)

pkgs/development/tools/build-managers/corrosion/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


stdenv.mkDerivation rec {

  pname = "corrosion";

  version = "0.3.0";

  version = "0.3.3";



  src = fetchFromGitHub {

    owner = "corrosion-rs";

    repo = "corrosion";

    rev = "v${version}";

    hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo=";

    hash = "sha256-dXUjQmKk+UdgYqdMuNh9ALaots1t0xwg6hEWwAbGPJc=";

  };



  cargoRoot = "generator";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec { 
    inherit src;

    sourceRoot = "${src.name}/${cargoRoot}";

    name = "${pname}-${version}";

    hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q=";

    hash = "sha256-f+n/bjjdKar5aURkPNYKkHUll6lqNa/dlzq3dIFh+tc=";

  };



  buildInputs = lib.optional stdenv.isDarwin libiconv;