diff options
| author | Robin Gloster <mail@glob.in> | 2021-08-02 17:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 17:08:40 +0200 |
| commit | 15ffca434eb8c47d472c3508abe10616022b31a4 (patch) | |
| tree | b0e73ab8b0c835d2a3c6fe6dfecb547d81661cc4 /pkgs/development/libraries/mesa/default.nix | |
| parent | a476da069049bbdd1630ba1bc66e0ba0512cff15 (diff) | |
| parent | 5701e5bc3bfb317e1f37ff3fb889eae7584a1206 (diff) | |
| download | nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.gz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.bz2 nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.lz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.xz nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.tar.zst nixpkgs-15ffca434eb8c47d472c3508abe10616022b31a4.zip | |
Merge branch 'master' into meshcentral
Diffstat (limited to 'pkgs/development/libraries/mesa/default.nix')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2790d88387e..a23d02c29e4 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -83,9 +83,9 @@ self = stdenv.mkDerivation { # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: substituteInPlace src/util/xmlconfig.c --replace \ - 'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"' + 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' substituteInPlace src/util/meson.build --replace \ - "get_option('datadir')" "'${placeholder "out"}'" + "get_option('datadir')" "'${placeholder "out"}/share'" '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace meson.build --replace \ "find_program('nm')" \ |