diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-25 21:51:57 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-25 21:51:57 +0100 |
| commit | 06a054e6eb9d5ad395aa89e598205aa2c56afb61 (patch) | |
| tree | 91254460e5216addfcfa8aa457d3d480ed448b47 /pkgs/misc/emulators/wine | |
| parent | 2a2d3de78c950d46922f9aa13c3ff531cb142310 (diff) | |
| parent | 646b279c55780fa8cfe79b2a3b1e3ab53b445be7 (diff) | |
| download | nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.gz nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.bz2 nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.lz nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.xz nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.zst nixlib-06a054e6eb9d5ad395aa89e598205aa2c56afb61.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/emulators/wine')
| -rw-r--r-- | pkgs/misc/emulators/wine/staging.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index 5264e66279f7..df979c68a47f 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -5,7 +5,7 @@ with callPackage ./util.nix {}; let patch = (callPackage ./sources.nix {}).staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; -in assert (builtins.parseDrvName wineUnstable.name).version == patch.version; +in assert stdenv.lib.getVersion wineUnstable == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; |