diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index a38d8cc542a0..39ff6bb8917d 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -221,19 +221,11 @@ let inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: (shared // { inherit pname version; - inherit (shared) - src - nativeBuildInputs - buildInputs - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.3_8.patch @@ -286,4 +278,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; -} +})) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 7a1b6829a90e..152ef5fbee2b 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -257,20 +257,11 @@ let inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: (shared // { inherit pname version; - inherit (shared) - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch @@ -298,4 +289,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +})) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 45cf6e09586b..2cef4f79dcd0 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -278,20 +278,11 @@ let inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: (shared // { inherit pname version; - inherit (shared) - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch @@ -327,4 +318,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +}))