···103103 url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch";
104104 sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav";
105105 })
106106+ ] ++ lib.optionals stdenv.isDarwin [
107107+ # The Hypervisor.framework support patch converted something that can be applied:
108108+ # * https://patchwork.kernel.org/project/qemu-devel/list/?series=548227
109109+ # The base revision is whatever commit there is before the series starts:
110110+ # * https://github.com/patchew-project/qemu/commits/patchew/20210916155404.86958-1-agraf%40csgraf.de
111111+ # The target revision is what patchew has as the series tag from patchwork:
112112+ # * https://github.com/patchew-project/qemu/releases/tag/patchew%2F20210916155404.86958-1-agraf%40csgraf.de
113113+ (fetchpatch {
114114+ url = "https://github.com/patchew-project/qemu/compare/7adb961995a3744f51396502b33ad04a56a317c3..d2603c06d9c4a28e714b9b70fe5a9d0c7b0f934d.diff";
115115+ sha256 = "sha256-nSi5pFf9+EefUmyJzSEKeuxOt39ztgkXQyUB8fTHlcY=";
116116+ })
106117 ];
107118108119 postPatch = ''
···166177167178 doCheck = false; # tries to access /dev
168179 dontWrapGApps = true;
180180+181181+ # QEMU attaches entitlements with codesign and strip removes those,
182182+ # voiding the entitlements and making it non-operational.
183183+ # The alternative is to re-sign with entitlements after stripping:
184184+ # * https://github.com/qemu/qemu/blob/v6.1.0/scripts/entitlement.sh#L25
185185+ dontStrip = stdenv.isDarwin;
169186170187 postFixup = ''
171188 # the .desktop is both invalid and pointless
···4242 "--with-systemdsystemunitdir=$(out)/lib/systemd/system"
4343 "--enable-uinput" # explicit activation because build env has no uinput
4444 "--enable-devinput" # explicit activation because build env has no /dev/input
4545+ "--with-lockdir=/run/lirc/lock" # /run/lock is not writable for 'lirc' user
4546 ];
46474748 installFlags = [
+2-29
pkgs/development/misc/resholve/test.nix
···33, callPackage
44, resholve
55, resholvePackage
66+, resholveScript
77+, resholveScriptBin
68, shunit2
79, coreutils
810, gnused
···2224}:
23252426let
2525- inherit (callPackage ./default.nix { })
2626- resholve resholvePackage resholveScript resholveScriptBin;
2727-2828- # ourCoreutils = coreutils.override { singleBinary = false; };
2929-3030- /*
3131- TODO: wrapped copy of find so that we can eventually test
3232- our ability to see through wrappers. Unused for now.
3333- Note: grep can serve the negative case; grep doesn't match, and
3434- egrep is a shell wrapper for grep.
3535- */
3636- # wrapfind = runCommand "wrapped-find" { } ''
3737- # source ${makeWrapper}/nix-support/setup-hook
3838- # makeWrapper ${findutils}/bin/find $out/bin/wrapped-find
3939- # '';
4040- /* TODO:
4141- unrelated, but is there already a function (or would
4242- there be demand for one?) along the lines of:
4343- wrap = { drv, executable(s?), args ? { } }: that:
4444- - generates a sane output name
4545- - sources makewrapper
4646- - retargets real executable if already wrapped
4747- - wraps the executable
4848-4949- I wonder because my first thought here was overrideAttrs,
5050- but I realized rebuilding just for a custom wrapper is an
5151- ongoing waste of time. If it is a common pattern in the
5252- wild, it would be a nice QoL improvement.
5353- */
54275528in
5629rec {