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/libwnck | |
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/libwnck')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libwnck/3.x.nix | 12 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libwnck/default.nix | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix index 78aa231bda3a..3792b826f594 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/3.x.nix @@ -1,9 +1,9 @@ -{ stdenv +{ lib, stdenv , fetchurl , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , gtk-doc , docbook_xsl , docbook_xml_dtd_412 @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; }; nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext gobject-introspection gtk-doc @@ -62,11 +62,11 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "${pname}${stdenv.lib.versions.major version}"; + attrPath = "${pname}${lib.versions.major version}"; }; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libwnck/default.nix b/nixpkgs/pkgs/development/libraries/libwnck/default.nix index 2872181a36d8..c0019ee268af 100644 --- a/nixpkgs/pkgs/development/libraries/libwnck/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwnck/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: +{ lib, stdenv, fetchurl, pkg-config, gtk2, intltool, xorg }: stdenv.mkDerivation rec { pname = "libwnck"; version = "2.31.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3"; }; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for creating task lists and pagers"; homepage = "https://gitlab.gnome.org/GNOME/libwnck"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ johnazoidberg ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ johnazoidberg ]; }; } |