diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/libraries/gjs/default.nix | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gjs/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gjs/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gjs/default.nix b/nixpkgs/pkgs/development/libraries/gjs/default.nix index 9437d76335d0..a6b37c5efcc2 100644 --- a/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -1,9 +1,9 @@ { fetchurl , fetchpatch -, stdenv +, lib, stdenv , meson , ninja -, pkgconfig +, pkg-config , gnome3 , gtk3 , atk @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { version = "1.66.1"; src = fetchurl { - url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0k1ld2bc4c3zbyjpfgx15v5n02iywdvm106rys5jqr7zbr2l0hld"; }; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config makeWrapper which # for locale detection libxml2 # for xml-stripblanks @@ -105,7 +105,7 @@ in stdenv.mkDerivation rec { postFixup = '' wrapProgram "$installedTests/libexec/installed-tests/gjs/minijasmine" \ --prefix XDG_DATA_DIRS : "$installedTestsSchemaDatadir" \ - --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" testDeps}" ''; checkPhase = '' @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; |