diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-05-22 07:03:39 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-22 18:50:57 -0400 |
| commit | b1bc0645eaa0118757275871c31fe17547cbc477 (patch) | |
| tree | 06fdfe593631b14188fd377e74d9e37d17bb5c49 /nixos | |
| parent | 23a3256ee1ece61eeb4e9a9a1fb6131b35e86abc (diff) | |
| download | nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.tar nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.tar.gz nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.tar.bz2 nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.tar.lz nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.tar.xz nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.tar.zst nixpkgs-b1bc0645eaa0118757275871c31fe17547cbc477.zip | |
gdk-pixbuf: rename from gdk_pixbuf
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/gdk-pixbuf.nix | 8 | ||||
| -rw-r--r-- | nixos/tests/gdk-pixbuf.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/ostree.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index 2dc8eabd95a..9ad926369ec 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -5,21 +5,21 @@ with lib; let cfg = config.services.xserver.gdk-pixbuf; - # Get packages to generate the cache for. We always include gdk_pixbuf. - effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages); + # Get packages to generate the cache for. We always include gdk-pixbuf. + effectivePackages = unique ([pkgs.gdk-pixbuf] ++ cfg.modulePackages); # Generate the cache file by running gdk-pixbuf-query-loaders for each # package and concatenating the results. loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } '' ( for package in ${concatStringsSep " " effectivePackages}; do - module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}" + module_dir="$package/${pkgs.gdk-pixbuf.moduleDir}" if [[ ! -d $module_dir ]]; then echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2 continue fi GDK_PIXBUF_MODULEDIR="$module_dir" \ - ${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders + ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders done ) > "$out" ''; diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix index 005c5111da2..9a62b593f46 100644 --- a/nixos/tests/gdk-pixbuf.nix +++ b/nixos/tests/gdk-pixbuf.nix @@ -3,12 +3,12 @@ import ./make-test.nix ({ pkgs, ... }: { name = "gdk-pixbuf"; meta = { - maintainers = pkgs.gdk_pixbuf.meta.maintainers; + maintainers = pkgs.gdk-pixbuf.meta.maintainers; }; machine = { pkgs, ... }: { environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; - environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ]; + environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk-pixbuf.installedTests}/share" ]; # Tests allocate a lot of memory trying to exploit a CVE # but qemu-system-i386 has a 2047M memory limit diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix index 8b19004874e..d7ad84a1a5f 100644 --- a/nixos/tests/ostree.nix +++ b/nixos/tests/ostree.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: { gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ])) ]; - environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests + environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk-pixbuf atk ]); # for GJS tests }; testScript = '' |