Commit 8b4371ef authored by Doron Behar's avatar Doron Behar
Browse files

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

parent 441f8ee1

pkgs/applications/radio/gnuradio/3.8.nix

+5 −13
Original line number Diff line number Diff line
@@ -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

    ''

  ;

}
 
}))

pkgs/applications/radio/gnuradio/3.9.nix

+5 −14
Original line number Diff line number Diff line
@@ -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

    ''

  ;

}
 
}))

pkgs/applications/radio/gnuradio/default.nix

+5 −14
Original line number Diff line number Diff line
@@ -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

    ''

  ;

}
 
}))