From 2b348b79c1daf73c9bb436d71e470e6d4e51fed6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 21 Dec 2023 15:38:45 +0200 Subject: [PATCH] gnuradio3_9Minimal: use a backported modtool patch --- pkgs/applications/radio/gnuradio/3.9.nix | 2 +- .../gnuradio/modtool-newmod-permissions.3_9.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 4d10851b7e13..62ee880ce2be 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -276,7 +276,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 - ./modtool-newmod-permissions.patch + ./modtool-newmod-permissions.3_9.patch ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch new file mode 100644 index 000000000000..7cab73fede0c --- /dev/null +++ b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch @@ -0,0 +1,15 @@ +diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py +index babebfcde..9a02f663e 100644 +--- c/gr-utils/modtool/core/newmod.py ++++ w/gr-utils/modtool/core/newmod.py +@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): + self._setup_scm(mode='new') + logger.info(f"Creating out-of-tree module in {self.dir}...") + try: +- shutil.copytree(self.srcdir, self.dir) ++ # https://stackoverflow.com/a/17022146/4935114 ++ shutil.copystat = lambda x, y: x ++ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) + try: + shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), + os.path.join(self.dir, '.clang-format'))