diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-28 12:02:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:02:37 +0000 |
| commit | 02ded84748c1f742efcae620b994d262dc8b2980 (patch) | |
| tree | f798e4e7c719c23f685854381da7bf538addc074 | |
| parent | Merge release-21.05 into staging-next-21.05 (diff) | |
| parent | Merge pull request #131784 from NixOS/backport-131765-to-release-21.05 (diff) | |
| download | nixpkgs-02ded84748c1f742efcae620b994d262dc8b2980.tar.gz | |
Merge release-21.05 into staging-next-21.05
| -rw-r--r-- | pkgs/applications/audio/gpodder/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/games/ecwolf/default.nix | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 681c6ffe2810..cd5e476b8845 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -29,8 +29,14 @@ python3Packages.buildPythonApplication rec { glibcLocales ]; + # as of 2021-07, the gobject-introspection setup hook does not + # work with `strictDeps` enabled, thus for proper `wrapGAppsHook` + # it needs to be disabled explicitly. https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + buildInputs = [ python3 + gtk3 gobject-introspection gnome.adwaita-icon-theme ]; @@ -49,7 +55,6 @@ python3Packages.buildPythonApplication rec { eyeD3 podcastparser html5lib - gtk3 ]; makeFlags = [ diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 519398a738bf..b7bb382db835 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i -e "s|ecwolf.pk3|$out/share/ecwolf/ecwolf.pk3|" src/version.h + '' + # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store + + lib.optionalString (stdenv.isDarwin) '' + sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt ''; # Install the required PK3 file in the required data directory @@ -46,7 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://maniacsvault.net/ecwolf/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; - # Darwin is untested (supported by upstream) platforms = platforms.all; }; } |