commit 200a91646cc65db7cc08413e2af2cafb70ff3ce3 · pyrox.dev/nixpkgs

+21

pkgs/tools/security/pinentry/fix-with-xcbuild-plistbuddy.patch

···

       1
       1
       +
       diff --git a/macosx/copyInfoPlist.sh b/macosx/copyInfoPlist.sh

     

       2
       2
       +
       index f366665153..dfd9511e79 100755

     

       3
       3
       +
       --- a/macosx/copyInfoPlist.sh

     

       4
       4
       +
       +++ b/macosx/copyInfoPlist.sh

     

       5
       5
       +
       @@ -20,9 +20,10 @@

     

       6
       6
       +
        cp "$1" "$dest" || exit 1

     

       7
       7
       +
        

     

       8
       8
       +
        

     

       9
       9
       +
       -/usr/libexec/PlistBuddy \

     

       10
       10
       +
       -	-c "Set CommitHash '${COMMIT_HASH:--}'" \

     

       11
       11
       +
       -	-c "Set BuildNumber '${BUILD_NUMBER:-0}'" \

     

       12
       12
       +
       -	-c "Set CFBundleVersion '${BUILD_VERSION:-0n}'" \

     

       13
       13
       +
       -	-c "Set CFBundleShortVersionString '$VERSION'" \

     

       14
       14
       +
       -	"$dest" || exit 1

     

       15
       15
       +
       +PlistBuddy "$dest" <<EOF || exit 1

     

       16
       16
       +
       +    Set CommitHash "${COMMIT_HASH:--}"

     

       17
       17
       +
       +    Set BuildNumber "${BUILD_NUMBER:-0}"

     

       18
       18
       +
       +    Set CFBundleVersion "${BUILD_VERSION:-0n}"

     

       19
       19
       +
       +    Set CFBundleShortVersionString "$VERSION"

     

       20
       20
       +
       +    Save

     

       21
       21
       +
       +EOF

+7 -5

pkgs/tools/security/pinentry/mac.nix

···

       7
       7
        
         libgpg-error,

     

       8
       8
        
         makeBinaryWrapper,

     

       9
       9
        
         texinfo,

     

       10
       10
       +
         xcbuild,

     

       10
       11
        
         common-updater-scripts,

     

       11
       12
        
         writers,

     

       12
       13
        
       }:

     
···

       27
       28
        
       

     

       28
       29
        
         patches = [

     

       29
       30
        
           ./gettext-0.25.patch

     

       31
       31
       +
       

     

       32
       32
       +
           # Fix the build with xcbuild’s inferior `PlistBuddy(8)`.

     

       33
       33
       +
           ./fix-with-xcbuild-plistbuddy.patch

     

       30
       34
        
         ];

     

       31
       35
        
       

     

       32
       36
        
         # use pregenerated nib files because generating them requires XCode

     
···

       38
       42
        
           cp '${lib.getDev libassuan}/share/aclocal/libassuan.m4' m4/libassuan.m4

     

       39
       43
        
         '';

     

       40
       44
        
       

     

       41
       41
       -
         # Unfortunately, PlistBuddy from xcbuild is not compatible enough pinentry-mac’s build process.

     

       42
       42
       -
         sandboxProfile = ''

     

       43
       43
       -
           (allow process-exec (literal "/usr/libexec/PlistBuddy"))

     

       44
       44
       -
         '';

     

       45
       45
       -
       

     

       46
       45
        
         strictDeps = true;

     

       47
       46
        
         nativeBuildInputs = [

     

       48
       47
        
           autoreconfHook

     

       49
       48
        
           makeBinaryWrapper

     

       50
       49
        
           texinfo

     

       50
       50
       +
       

     

       51
       51
       +
           # for `PlistBuddy(8)`

     

       52
       52
       +
           xcbuild

     

       51
       53
        
         ];

     

       52
       54
        
       

     

       53
       55
        
         configureFlags = [