From a16a4a91ab1cb60d943c18349d647ae84f2c3073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 28 Jul 2021 05:20:26 +0200 Subject: [PATCH 1/3] gpodder: fix gtk3 wrapping (cherry picked from commit 7355b2bc3d7cb11bd8764a99f31f098ef1849143) --- pkgs/applications/audio/gpodder/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 681c6ffe281..7696858ef50 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -29,8 +29,11 @@ python3Packages.buildPythonApplication rec { glibcLocales ]; + strictDeps = false; + buildInputs = [ python3 + gtk3 gobject-introspection gnome.adwaita-icon-theme ]; @@ -49,7 +52,6 @@ python3Packages.buildPythonApplication rec { eyeD3 podcastparser html5lib - gtk3 ]; makeFlags = [ From c4037352d1c40a8f3b58f6d4393e333c1013eb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 28 Jul 2021 04:22:19 +0100 Subject: [PATCH 2/3] Update pkgs/applications/audio/gpodder/default.nix (cherry picked from commit 0f2685217c7402175988cbb2c525ab072da41904) --- pkgs/applications/audio/gpodder/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 7696858ef50..cd5e476b884 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -29,6 +29,9 @@ 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 = [ From 099ec68772335e3a25481550b91c6803ed0a5543 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Tue, 27 Jul 2021 23:11:09 +0200 Subject: [PATCH 3/3] ecwolf: fix compilation on darwin (cherry picked from commit f65e1d8793c76766c45d04a507196dbff4a4e10f) --- pkgs/games/ecwolf/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 519398a738b..b7bb382db83 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; }; }