diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/tools/misc/heimdall | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/heimdall')
| -rw-r--r-- | nixpkgs/pkgs/tools/misc/heimdall/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/misc/heimdall/default.nix b/nixpkgs/pkgs/tools/misc/heimdall/default.nix index 41b6adb7bfa2..3dcefa8b2d0f 100644 --- a/nixpkgs/pkgs/tools/misc/heimdall/default.nix +++ b/nixpkgs/pkgs/tools/misc/heimdall/default.nix @@ -31,7 +31,11 @@ mkDerivation { substituteInPlace libpit/CMakeLists.txt --replace "-std=gnu++11" "" ''; - installPhase = '' + installPhase = lib.optionalString (stdenv.isDarwin && enableGUI) '' + mkdir -p $out/Applications + mv bin/heimdall-frontend.app $out/Applications/heimdall-frontend.app + wrapQtApp $out/Applications/heimdall-frontend.app/Contents/MacOS/heimdall-frontend + '' + '' mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d} install -m755 -t $out/bin bin/* install -m644 -t $out/lib/udev/rules.d ../heimdall/60-heimdall.rules |