diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-15 21:03:52 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-15 21:04:31 +0200 |
commit | e4a009a109f36686adde6fe15e00475072c45abf (patch) | |
tree | 7bd9733ea7b9b9268fcef5fa2f636039e9000557 /pkgs/development/libraries/gobject-introspection/default.nix | |
parent | fbb86b1fa81ae7f29c6775066f6ce089db5ff6d3 (diff) | |
download | nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.tar nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.tar.gz nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.tar.bz2 nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.tar.lz nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.tar.xz nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.tar.zst nixpkgs-e4a009a109f36686adde6fe15e00475072c45abf.zip |
gobject-introspection: consolidate patches
and add comments
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection/default.nix')
-rw-r--r-- | pkgs/development/libraries/gobject-introspection/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 7ff5498e5a9..42c2b42f948 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -35,16 +35,15 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./test_shlibs.patch; - inherit nixStoreDir; - }) - + # Make g-ir-scanner put absolute path to GIR files it generates + # so that programs can just dlopen them without having to muck + # with LD_LIBRARY_PATH environment variable. (substituteAll { src = ./absolute_shlib_path.patch; inherit nixStoreDir; }) ] ++ stdenv.lib.optionals x11Support [ + # Hardcode the cairo shared library path in the Cairo gir shipped with this package. # https://github.com/NixOS/nixpkgs/issues/34080 (substituteAll { src = ./absolute_gir_path.patch; |