diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:22:28 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:22:28 +0000 |
| commit | 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca (patch) | |
| tree | 1654f2f0cb883fa4cb95def306a933475d065431 /pkgs/servers/x11 | |
| parent | 99537e994f09e8e5499d3d877df0e16da8452ca7 (diff) | |
| download | nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.gz nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.bz2 nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.lz nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.xz nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.tar.zst nixpkgs-9b090ccbca3f7dd26d91db06e96e8bf8282c37ca.zip | |
treewide: Get rid of most `parseDrvName` without breaking compat
That is because this commit should be merged to both master and release-19.09.
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7e081b664b3..593afff2a07 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -520,7 +520,7 @@ self: super: xorgserver = with self; super.xorgserver.overrideAttrs (attrs_passed: # exchange attrs if abiCompat is set let - version = (builtins.parseDrvName attrs_passed.name).version; + version = lib.getVersion attrs_passed; attrs = if (abiCompat == null || lib.hasPrefix abiCompat version) then attrs_passed // { @@ -555,7 +555,7 @@ self: super: in attrs // (let - version = (builtins.parseDrvName attrs.name).version; + version = lib.getVersion attrs; commonBuildInputs = attrs.buildInputs ++ [ xtrans ]; commonPropagatedBuildInputs = [ zlib libGL libGLU dbus |