about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2020-06-11 18:17:28 +0000
committerGitHub <noreply@github.com>2020-06-11 18:17:28 +0000
commit5528185628098a136a9383d8cb32bf2232ca87c0 (patch)
treeabeacba2b78340d8f0c066665782cfc94075785b
parent45f21f7c8433f3e2b237c86e105fc81d00cfe56b (diff)
parent21c3245b673702ad9064318f95a1c002d1bb3dcd (diff)
downloadnixlib-5528185628098a136a9383d8cb32bf2232ca87c0.tar
nixlib-5528185628098a136a9383d8cb32bf2232ca87c0.tar.gz
nixlib-5528185628098a136a9383d8cb32bf2232ca87c0.tar.bz2
nixlib-5528185628098a136a9383d8cb32bf2232ca87c0.tar.lz
nixlib-5528185628098a136a9383d8cb32bf2232ca87c0.tar.xz
nixlib-5528185628098a136a9383d8cb32bf2232ca87c0.tar.zst
nixlib-5528185628098a136a9383d8cb32bf2232ca87c0.zip
Merge pull request #90150 from 7c6f434c/wine-staging-desc
winePackages.staging: mention staging patches in description
-rw-r--r--pkgs/misc/emulators/wine/staging.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 5c2469f8f44e..48ea93a97a8e 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -7,7 +7,7 @@ let patch = (callPackage ./sources.nix {}).staging;
       (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
 in assert stdenv.lib.getVersion wineUnstable == patch.version;
 
-stdenv.lib.overrideDerivation wineUnstable (self: {
+(stdenv.lib.overrideDerivation wineUnstable (self: {
   buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
 
   name = "${self.name}-staging";
@@ -21,4 +21,8 @@ stdenv.lib.overrideDerivation wineUnstable (self: {
     ./patchinstall.sh DESTDIR="$PWD/.." --all
     cd ..
   '';
-})
+})) // {
+  meta = wineUnstable.meta // {
+    description = wineUnstable.meta.description + " (with staging patches)";
+  };
+}