diff options
author | Felix Buehler <account@buehler.rocks> | 2022-03-22 17:57:23 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2022-03-23 22:34:54 +0100 |
commit | e0476d93fe71dabae965f153724648df813c4fe0 (patch) | |
tree | ac1e7dc7463908a6bac68c04219502302dbe35db /pkgs/applications/radio | |
parent | 5dbd4b2b27e24eaed6a79603875493b15b999d4b (diff) | |
download | nixlib-e0476d93fe71dabae965f153724648df813c4fe0.tar nixlib-e0476d93fe71dabae965f153724648df813c4fe0.tar.gz nixlib-e0476d93fe71dabae965f153724648df813c4fe0.tar.bz2 nixlib-e0476d93fe71dabae965f153724648df813c4fe0.tar.lz nixlib-e0476d93fe71dabae965f153724648df813c4fe0.tar.xz nixlib-e0476d93fe71dabae965f153724648df813c4fe0.tar.zst nixlib-e0476d93fe71dabae965f153724648df813c4fe0.zip |
treewide: rename name to pname&version
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 |