Commit d9f25fb6 authored by Stanisław Pitucha's avatar Stanisław Pitucha
Browse files

betterdisplay,cyberduck,enpass-mac: use re-plistbuddy instead of xcbuild

parent 07199b02

pkgs/by-name/be/betterdisplay/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
  nix-update-script,

  versionCheckHook,

  writeShellScript,

  xcbuild,

  re-plistbuddy,

}:



stdenvNoCC.mkDerivation (finalAttrs: {
@@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


  nativeInstallCheckInputs = [ versionCheckHook ];

  versionCheckProgram = writeShellScript "version-check" ''

    ${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1"

    ${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1"

  '';

  versionCheckProgramArg = [

    "${placeholder "out"}/Applications/BetterDisplay.app/Contents/Info.plist"

pkgs/by-name/cy/cyberduck/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -6,8 +6,7 @@ 
  makeBinaryWrapper,

  versionCheckHook,

  writeShellScript,

  coreutils,

  xcbuild,

  re-plistbuddy,

}:

stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "cyberduck";
@@ -36,8 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


  nativeInstallCheckInputs = [ versionCheckHook ];

  versionCheckProgram = writeShellScript "version-check" ''

    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')

    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")

    marketing_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1")

    build_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1")



    echo $marketing_version.$build_version

  '';

pkgs/by-name/en/enpass-mac/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
  common-updater-scripts,

  versionCheckHook,

  writeShellScript,

  coreutils,

  xcbuild,

  re-plistbuddy,

}:



stdenvNoCC.mkDerivation (finalAttrs: {
@@ -71,8 +70,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { 


  nativeInstallCheckInputs = [ versionCheckHook ];

  versionCheckProgram = writeShellScript "version-check" ''

    marketing_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleShortVersionString" "$1" | ${coreutils}/bin/tr -d '"')

    build_version=$(${xcbuild}/bin/PlistBuddy -c "Print :CFBundleVersion" "$1")

    marketing_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleShortVersionString" "$1")

    build_version=$(${lib.getExe' re-plistbuddy "PlistBuddy"} -c "Print :CFBundleVersion" "$1")



    echo $marketing_version.$build_version

  '';