nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnuradio*: use finalAttrs, and always inherit all shared attributes

Browse Source
This commit is contained in:
Doron Behar 2023-10-03 15:28:23 +03:00
parent 441f8ee17f
commit 8b4371ef1a
3 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/radio/gnuradio/3.8.nix
View File

@ -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
''
;
}
}))

19
pkgs/applications/radio/gnuradio/3.9.nix
View File

@ -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
''
;
}
}))

19
pkgs/applications/radio/gnuradio/default.nix
View File

@ -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
''
;
}
}))