diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2022-03-24 22:55:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-24 22:55:34 -0500 |
| commit | 1cf5591a99f9d1f0b4bff66f1533917f4c597112 (patch) | |
| tree | 782e1b7783c83738883e57937f0d975645e9ceed /pkgs/applications/radio | |
| parent | cee88c2a1f636a3eaf5a1a07ed8ee904b1e22116 (diff) | |
| parent | e0476d93fe71dabae965f153724648df813c4fe0 (diff) | |
| download | nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.gz nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.bz2 nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.lz nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.xz nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.tar.zst nixlib-1cf5591a99f9d1f0b4bff66f1533917f4c597112.zip | |
Merge pull request #165303 from Stunkymonkey/treewide-pname-version-18
Diffstat (limited to 'pkgs/applications/radio')
| -rw-r--r-- | pkgs/applications/radio/gnuradio/wrapper.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 4cbccbd51819..6765c877437b 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -50,7 +50,8 @@ let ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); - name = (lib.appendToName "wrapped" unwrapped).name; + pname = unwrapped.pname + "-wrapped"; + inherit (unwrapped) version; makeWrapperArgs = builtins.concatStringsSep " " ([ ] # Emulating wrapGAppsHook & wrapQtAppsHook working together @@ -59,7 +60,7 @@ let || (unwrapped.hasFeature "gr-qtgui") ) [ "--prefix" "XDG_DATA_DIRS" ":" "$out/share" - "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" + "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${pname}" "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" # Needs to run `gsettings` on startup, see: @@ -135,7 +136,7 @@ let }; self = if doWrap then stdenv.mkDerivation { - inherit name passthru; + inherit pname version passthru; buildInputs = [ makeWrapper xorg.lndir |