Unverified Commit b0058419 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

grandorgue: 3.15.1-1 -> 3.15.2-1 (#351325)

parents 5537745a 48d9153f

pkgs/applications/audio/grandorgue/darwin-fixes.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt

index d231e3d1..73f389a2 100644

--- a/resources/CMakeLists.txt

+++ b/resources/CMakeLists.txt

@@ -62,7 +62,7 @@ if(WIN32)

 		     DEPENDS "${CMAKE_SOURCE_DIR}/resources/GrandOrgue.manifest")

   LIST(APPEND DEPLIST "${RESOURCEDIR}/GOIcon.ico" "${RESOURCEDIR}/GrandOrgue.rc" "${RESOURCEDIR}/GrandOrgue.manifest")

 elseif(APPLE)

-   ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND iconutil -c icns --output "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR} DEPENDS ${GENERATED_ICONS})

+   ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND png2icns "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png DEPENDS ${GENERATED_ICONS})

    INSTALL(FILES "${RESOURCEDIR}/GrandOrgue.icns" DESTINATION "${RESOURCEINSTDIR}")

    LIST(APPEND DEPLIST "${RESOURCEDIR}/GrandOrgue.icns")

 elseif(UNIX)

pkgs/applications/audio/grandorgue/default.nix

+3 −8
Original line number Diff line number Diff line
@@ -21,22 +21,17 @@ 


stdenv.mkDerivation rec {

  pname = "grandorgue";

  version = "3.15.1-1";

  version = "3.15.2-1";



  src = fetchFromGitHub {

    owner = "GrandOrgue";

    repo = "grandorgue";

    rev = version;

    fetchSubmodules = true;

    hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM=";

    hash = "sha256-U0DAWCzhXqdL2klSFQjnLiWp7yTdw/n0dmNUJSAg/5c=";

  };



  postPatch = ''

    substituteInPlace resources/CMakeLists.txt \

      --replace \

        "iconutil -c icns \''${GENERATED_ICONS_DIR}" \

        "png2icns \''${GENERATED_ICONS_DIR}/../GrandOrgue.icns \''${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png" \

  '';

  patches = [ ./darwin-fixes.patch ];



  nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ];